From 2c288b082d41376c94e7dc7e663560af7459b542 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Wed, 07 Sep 2022 13:32:46 +0000 Subject: [PATCH] fix(tests): keyring/logs/decimals parsing/comments --- --- a/tests/src/util/helpers.ts +++ b/tests/src/util/helpers.ts @@ -108,7 +108,7 @@ const dotPos = numberStr.length - decimals; if (dotPos <= 0) { - return '0.' + numberStr; + return '0.' + '0'.repeat(Math.abs(dotPos)) + numberStr; } else { const intPart = numberStr.substring(0, dotPos); const fractPart = numberStr.substring(dotPos); @@ -1115,7 +1115,10 @@ export async function paraSiblingSovereignAccount(paraid: number): Promise { return usingApi(async api => { + // We are getting a *sibling* parachain sovereign account, + // so we need a sibling prefix: encoded(b"sibl") == 0x7369626c const siblingPrefix = '0x7369626c'; + const encodedParaId = api.createType('u32', paraid).toHex(true).substring(2); const suffix = '000000000000000000000000000000000000000000000000'; @@ -1805,8 +1808,6 @@ }); if (neededEvent) { - console.log(`Event \`${eventIdStr}\` is found`); - unsubscribe(); resolve(neededEvent); } else if (maxBlocksToWait > 0) { @@ -1852,16 +1853,7 @@ let accountSeed = 10000; -const keyringEth = new Keyring({type: 'ethereum'}); -const keyringEd25519 = new Keyring({type: 'ed25519'}); -const keyringSr25519 = new Keyring({type: 'sr25519'}); - -export function generateKeyringPair(type: 'ethereum' | 'sr25519' | 'ed25519' = 'sr25519') { +export function generateKeyringPair(keyring: Keyring) { const privateKey = `0xDEADBEEF${(accountSeed++).toString(16).padStart(56, '0')}`; - if (type == 'sr25519') { - return keyringSr25519.addFromUri(privateKey); - } else if (type == 'ed25519') { - return keyringEd25519.addFromUri(privateKey); - } - return keyringEth.addFromUri(privateKey); + return keyring.addFromUri(privateKey); } -- gitstuff