Merge pull request #44 from subspace/43-export-more-utility-functions…

…-and-structures

Export more utility functions and structures

packages/auto-consensus/__test__/balances.test.ts

@@ -1,11 +1,11 @@
-import { ActivateWalletInput, activateWallet } from '@autonomys/auto-utils'
-import { address } from '../src/address'
-import { balance, totalIssuance } from '../src/balances'
+import { address, balance, totalIssuance } from '@autonomys/auto-consensus'
+import { ActivateWalletInput, activateWallet, getMockWallet } from '@autonomys/auto-utils'
 import { setup } from './helpers'
 
 describe('Verify balances functions', () => {
-  const { isLocalhost, TEST_NETWORK, TEST_MNEMONIC, TEST_ADDRESS, ALICE_URI, ALICE_ADDRESS } =
-    setup()
+  const { isLocalhost, TEST_NETWORK, TEST_MNEMONIC, TEST_ADDRESS, wallets } = setup()
+
+  const alice = getMockWallet('Alice', wallets)
 
   describe('Test totalIssuance()', () => {
     test('Check totalIssuance return a number greater than zero', async () => {
@@ -33,14 +33,7 @@ describe('Verify balances functions', () => {
 
     if (isLocalhost) {
       test('Check balance of Alice wallet is greater than 0', async () => {
-        const { api, accounts } = await activateWallet({
-          ...TEST_NETWORK,
-          uri: ALICE_URI,
-        } as ActivateWalletInput)
-        expect(accounts.length).toBeGreaterThan(0)
-        expect(accounts[0].address).toEqual(ALICE_ADDRESS)
-
-        const _balance = await balance(api, address(accounts[0].address))
+        const _balance = await balance(alice.api, address(alice.accounts[0].address))
         expect(_balance.free).toBeGreaterThan(BigInt(0))
       })
     }

packages/auto-consensus/__test__/helpers/index.ts

@@ -1,5 +1,3 @@
-export * from './events'
 export * from './setup'
 export * from './staking'
-export * from './sudo'
 export * from './tx'

packages/auto-consensus/__test__/helpers/setup.ts

@@ -1,5 +1,5 @@
 import type { NetworkInput } from '@autonomys/auto-utils'
-import { activate, disconnect, networks } from '@autonomys/auto-utils'
+import { activate, disconnect, mockWallets, networks, WalletActivated } from '@autonomys/auto-utils'
 
 export const setup = () => {
   const isLocalhost = process.env.LOCALHOST === 'true'
@@ -12,13 +12,12 @@ export const setup = () => {
 
   const TEST_MNEMONIC = 'test test test test test test test test test test test junk'
   const TEST_ADDRESS = '5GmS1wtCfR4tK5SSgnZbVT4kYw5W8NmxmijcsxCQE6oLW6A8'
-  const ALICE_URI = '//Alice'
-  const ALICE_ADDRESS = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY'
-  const BOB_URI = '//Bob'
-  const BOB_ADDRESS = '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'
+
+  let wallets: WalletActivated[] = []
 
   beforeAll(async () => {
     await activate(TEST_NETWORK)
+    wallets = await mockWallets()
   })
 
   afterAll(async () => {
@@ -31,9 +30,6 @@ export const setup = () => {
     TEST_INVALID_NETWORK,
     TEST_MNEMONIC,
     TEST_ADDRESS,
-    ALICE_URI,
-    ALICE_ADDRESS,
-    BOB_URI,
-    BOB_ADDRESS,
+    wallets,
   }
 }

packages/auto-consensus/__test__/helpers/tx.ts

@@ -1,68 +1,18 @@
+import { Events, signAndSendTx as signAndSend } from '@autonomys/auto-consensus'
 import type { AddressOrPair, SubmittableExtrinsic } from '@polkadot/api/types'
-import type { EventRecord } from '@polkadot/types/interfaces'
 import type { ISubmittableResult } from '@polkadot/types/types'
-import type { Events } from './events'
-
-const validateEvents = (
-  events: EventRecord[],
-  eventsExpected: Events,
-  tx: string,
-  block: string,
-  log: boolean = true,
-) => {
-  const _eventsExpected =
-    typeof eventsExpected === 'string'
-      ? [eventsExpected]
-      : eventsExpected.map((e: string | string[]) => (typeof e === 'string' ? [e] : e)).flat()
-
-  events.forEach(({ event: { data, method, section } }) => {
-    // if (log) console.log(`${section}.${method}`, data.toString()) // Uncomment this line to log every events with their data
-    const index = _eventsExpected.indexOf(`${section}.${method}`)
-    if (index > -1) _eventsExpected.splice(index, 1)
-    else if (log)
-      console.log('Event not expected', `${section}.${method}`, 'tx', tx, 'block', block)
-  })
-  if (_eventsExpected.length > 0)
-    console.log('Events not found', _eventsExpected, 'tx', tx, 'block', block)
-
-  expect(_eventsExpected).toHaveLength(0)
-
-  return _eventsExpected
-}
 
 export const signAndSendTx = async (
   sender: AddressOrPair,
   tx: SubmittableExtrinsic<'promise', ISubmittableResult>,
   eventsExpected: Events = [],
   log: boolean = true,
 ) => {
-  let txHashHex: string | undefined = undefined
-  let blockHash: string | undefined = undefined
-  await new Promise<void>((resolve, reject) => {
-    tx.signAndSend(sender, ({ events, status, txHash }) => {
-      if (status.isInBlock) {
-        txHashHex = txHash.toHex()
-        blockHash = status.asInBlock.toHex()
-        if (log) console.log('Successful tx', txHashHex, 'in block', blockHash)
+  const result = await signAndSend(sender, tx, eventsExpected, log)
 
-        if (eventsExpected.length > 0) {
-          eventsExpected = validateEvents(events, eventsExpected, txHashHex, blockHash, log)
-          if (eventsExpected.length === 0) resolve()
-          else reject(new Error('Events not found'))
-        } else resolve()
-      } else if (
-        status.isRetracted ||
-        status.isFinalityTimeout ||
-        status.isDropped ||
-        status.isInvalid
-      ) {
-        if (log) console.error('Transaction failed')
-        reject(new Error('Transaction failed'))
-      }
-    })
-  })
-  expect(txHashHex).toBeDefined()
-  expect(blockHash).toBeDefined()
+  expect(result.txHash).toBeDefined()
+  expect(result.blockHash).toBeDefined()
+  expect(result.eventsExpectedMissing).toHaveLength(0)
 
-  return { txHash: txHashHex, blockHash }
+  return result
 }

packages/auto-consensus/__test__/info.test.ts

@@ -1,4 +1,4 @@
-import { networkTimestamp } from '../src/info'
+import { networkTimestamp } from '@autonomys/auto-consensus'
 import { setup } from './helpers'
 
 describe('Verify info functions', () => {