feat: better blockchain api mocking

src/attestation/Attestation.spec.ts

@@ -17,7 +17,8 @@ describe('Attestation', () => {
   const identityAlice = Identity.buildFromURI('//Alice')
   const identityBob = Identity.buildFromURI('//Bob')
 
-  const Blockchain = require('../blockchain/Blockchain').default
+  const blockchainApi = require('../blockchainApiConnection/BlockchainApiConnection')
+    .__mocked_api
 
   const rawCType: ICType['schema'] = {
     $id: 'http://example.com/ctype-1',
@@ -50,16 +51,15 @@ describe('Attestation', () => {
   )
 
   it('stores attestation', async () => {
-    Blockchain.api.query.attestation.attestations = jest.fn(() => {
-      const tuple = new Option(
+    blockchainApi.query.attestation.attestations.mockReturnValue(
+      new Option(
         Tuple,
         new Tuple(
           [Text, AccountId, Text, Bool],
           [testCType.hash, identityAlice.address, undefined, false]
         )
       )
-      return Promise.resolve(tuple)
-    })
+    )
 
     const attestation: Attestation = Attestation.fromRequestAndPublicIdentity(
       requestForAttestation,
@@ -69,9 +69,9 @@ describe('Attestation', () => {
   })
 
   it('verify attestations not on chain', async () => {
-    Blockchain.api.query.attestation.attestations = jest.fn(() => {
-      return Promise.resolve(new Option(Tuple))
-    })
+    blockchainApi.query.attestation.attestations.mockReturnValue(
+      new Option(Tuple)
+    )
 
     const attestation: Attestation = Attestation.fromAttestation({
       claimHash: requestForAttestation.rootHash,
@@ -84,18 +84,16 @@ describe('Attestation', () => {
   })
 
   it('verify attestation revoked', async () => {
-    Blockchain.api.query.attestation.attestations = jest.fn(() => {
-      return Promise.resolve(
-        new Option(
-          Tuple,
-          new Tuple(
-            // Attestations: claim-hash -> (ctype-hash, account, delegation-id?, revoked)
-            [Text, AccountId, Text, Bool],
-            [testCType.hash, identityAlice.address, undefined, true]
-          )
+    blockchainApi.query.attestation.attestations.mockReturnValue(
+      new Option(
+        Tuple,
+        new Tuple(
+          // Attestations: claim-hash -> (ctype-hash, account, delegation-id?, revoked)
+          [Text, AccountId, Text, Bool],
+          [testCType.hash, identityAlice.address, undefined, true]
         )
       )
-    })
+    )
 
     const attestation: Attestation = Attestation.fromRequestAndPublicIdentity(
       requestForAttestation,

src/balance/Balance.spec.ts

@@ -7,16 +7,19 @@ import { listenToBalanceChanges, makeTransfer } from './Balance.chain'
 jest.mock('../blockchainApiConnection/BlockchainApiConnection')
 
 describe('Balance', () => {
-  const blockchain = require('../blockchain/Blockchain').default
-
-  blockchain.api.query.balances.freeBalance = jest.fn((accountAddress, cb) => {
-    if (cb) {
-      setTimeout(() => {
-        cb(new BN(42))
-      }, 1)
+  const blockchainApi = require('../blockchainApiConnection/BlockchainApiConnection')
+    .__mocked_api
+
+  blockchainApi.query.balances.freeBalance = jest.fn(
+    async (accountAddress, cb) => {
+      if (cb) {
+        setTimeout(() => {
+          cb(new BN(42))
+        }, 1)
+      }
+      return new BN(12)
     }
-    return new BN(12)
-  })
+  )
 
   it('should listen to balance changes', async done => {
     const bob = Identity.buildFromURI('//Bob')
@@ -33,8 +36,6 @@ describe('Balance', () => {
     expect(currentBalance.toString()).toEqual('12')
   })
 
-  blockchain.__mockResultHash = '123'
-
   it('should make transfer', async () => {
     const alice = Identity.buildFromURI('//Alice')
     const bob = Identity.buildFromURI('//Bob')