From 0f66a2adea9ab4ee216112b8ca27193b827f9918 Mon Sep 17 00:00:00 2001 From: Timo Welde Date: Tue, 9 Mar 2021 11:32:12 +0100 Subject: [PATCH 1/3] fix: faucet identity key type --- src/faucet/faucet.controller.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/faucet/faucet.controller.ts b/src/faucet/faucet.controller.ts index de9c8c4..b5faee2 100644 --- a/src/faucet/faucet.controller.ts +++ b/src/faucet/faucet.controller.ts @@ -68,7 +68,10 @@ export class FaucetController { try { console.log(`Transfer tokens from faucet to ${address}`) const faucetAccount: Identity = Identity.buildFromSeed( - hexToU8a(process.env.FAUCET_ACCOUNT) + hexToU8a(process.env.FAUCET_ACCOUNT), + { + signingKeyPairType: 'ed25519' + } ) const tx = await Balance.makeTransfer( faucetAccount, From 5e3446c5be51825ce828c5b6cbd5bf082ab0ad78 Mon Sep 17 00:00:00 2001 From: dudleyneedham Date: Tue, 9 Mar 2021 11:46:52 +0100 Subject: [PATCH 2/3] fix: linting issue --- src/faucet/faucet.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/faucet/faucet.controller.ts b/src/faucet/faucet.controller.ts index b5faee2..ce50200 100644 --- a/src/faucet/faucet.controller.ts +++ b/src/faucet/faucet.controller.ts @@ -70,7 +70,7 @@ export class FaucetController { const faucetAccount: Identity = Identity.buildFromSeed( hexToU8a(process.env.FAUCET_ACCOUNT), { - signingKeyPairType: 'ed25519' + signingKeyPairType: 'ed25519', } ) const tx = await Balance.makeTransfer( From e97a60068d51e94e68a7642d509f1f0d576f49b5 Mon Sep 17 00:00:00 2001 From: dudleyneedham Date: Tue, 9 Mar 2021 11:58:57 +0100 Subject: [PATCH 3/3] fix: added all the ed25519 to the test --- src/faucet/faucet.module.spec.ts | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/faucet/faucet.module.spec.ts b/src/faucet/faucet.module.spec.ts index 9d94bb0..dc88d7f 100644 --- a/src/faucet/faucet.module.spec.ts +++ b/src/faucet/faucet.module.spec.ts @@ -98,7 +98,9 @@ describe('Faucet Module', () => { } beforeAll(async () => { await cryptoWaitReady() - faucetIdentity = Identity.buildFromSeed(hexToU8a(FAUCET_SEED)) + faucetIdentity = Identity.buildFromSeed(hexToU8a(FAUCET_SEED), { + signingKeyPairType: 'ed25519', + }) process.env['FAUCET_ACCOUNT'] = FAUCET_SEED }) beforeEach(async () => { @@ -217,7 +219,10 @@ describe('Faucet Module', () => { await faucetController['transferTokens'](claimerAddress) ).toEqual(true) expect(buildSpy).toHaveBeenCalledWith( - hexToU8a(process.env.FAUCET_ACCOUNT) + hexToU8a(process.env.FAUCET_ACCOUNT), + { + signingKeyPairType: 'ed25519', + } ) expect(mockedMakeTransfer).toHaveBeenCalledWith( faucetIdentity, @@ -237,7 +242,10 @@ describe('Faucet Module', () => { await faucetController['transferTokens'](claimerAddress) ).toEqual(false) expect(buildSpy).toHaveBeenCalledWith( - hexToU8a(process.env.FAUCET_ACCOUNT) + hexToU8a(process.env.FAUCET_ACCOUNT), + { + signingKeyPairType: 'ed25519', + } ) expect(mockedMakeTransfer).not.toHaveBeenCalled() buildSpy.mockReturnValue(faucetIdentity) @@ -248,7 +256,10 @@ describe('Faucet Module', () => { await faucetController['transferTokens'](claimerAddress) ).toEqual(false) expect(buildSpy).toHaveBeenCalledWith( - hexToU8a(process.env.FAUCET_ACCOUNT) + hexToU8a(process.env.FAUCET_ACCOUNT), + { + signingKeyPairType: 'ed25519', + } ) expect(mockedMakeTransfer).toHaveBeenCalledWith( faucetIdentity, @@ -263,7 +274,10 @@ describe('Faucet Module', () => { await faucetController['transferTokens'](claimerAddress) ).toEqual(false) expect(buildSpy).toHaveBeenCalledWith( - hexToU8a(process.env.FAUCET_ACCOUNT) + hexToU8a(process.env.FAUCET_ACCOUNT), + { + signingKeyPairType: 'ed25519', + } ) expect(mockedMakeTransfer).toHaveBeenCalledWith( faucetIdentity,