Fix exchange test

alephium · Jan 4, 2024 · 232319d · 232319d
1 parent e4a1c6e
commit 232319d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/web3/src/utils/exchange.test.ts b/packages/web3/src/utils/exchange.test.ts
@@ -72,6 +72,7 @@ describe('exchange', function () {
       'Invalid base58 string'
     )
     expect(() => validateExchangeAddress('1GKWggDapVjTdU2vyna3YjVgdpnwHkKzx8FHA9gU7uoeY')).not.toThrow()
+    expect(() => validateExchangeAddress('1fvbFEFML2F2GZmNDHd9uafFALMG8QSwbCJHfQipw6sz')).not.toThrow()
     const nodeProvider = new NodeProvider('http://127.0.0.1:22973')
     for (let i = 0; i < 20; i++) {
       const wallet0 = PrivateKeyWallet.Random(undefined, nodeProvider, 'default')

diff --git a/test/exchange.test.ts b/test/exchange.test.ts
@@ -205,7 +205,7 @@ class Exchange {
     this.depositTxs.push(tx.unsigned.txId)
   }
 
-  async handleBlock(block: node.BlockEntry) {
+  async handleBlock(block: node.BlockEntry, resolver: () => void) {
     for (const tx of block.transactions) {
       if (isSimpleALPHTransferTx(tx)) {
         const { targetAddress, depositAmount } = getALPHDepositInfo(tx)
@@ -214,13 +214,16 @@ class Exchange {
         }
       }
     }
+    resolver()
   }
 
   async startPolling(): Promise<void> {
-    this.eventEmitter.on('block', (block) => this.handleBlock(block))
-    const callback = (block: node.BlockEntry) => {
-      this.eventEmitter.emit('block', block)
-      return Promise.resolve()
+    this.eventEmitter.on('block', ([block, resolver]) => this.handleBlock(block, resolver))
+    const callback = async (block: node.BlockEntry) => {
+      let resolver: any
+      const promise = new Promise<void>((r) => (resolver = r))
+      this.eventEmitter.emit('block', [block, resolver])
+      return await promise
     }
     for (let fromGroup = 0; fromGroup < TOTAL_NUMBER_OF_GROUPS; fromGroup++) {
       for (let toGroup = 0; toGroup < TOTAL_NUMBER_OF_GROUPS; toGroup++) {