fix accountant ci check

wormhole-foundation · Feb 28, 2024 · 123e03d · 123e03d
1 parent b6140ba
commit 123e03d
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 15 deletions.
diff --git a/wormchain/contracts/tools/__tests__/test_accountant.ts b/wormchain/contracts/tools/__tests__/test_accountant.ts
@@ -511,13 +511,23 @@ describe("Global Accountant Tests", () => {
         throw new Error("Expected metrics change did not occur");
       }
       // the transfer should fail, because there's an insufficient source balance
-      await expect(
-        fetchGlobalAccountantTransferStatus(
+      if (VAA_SIGNERS.length > 1) {
+        const transferStatus = await fetchGlobalAccountantTransferStatus(
           CHAIN_ID_BSC,
-          getEmitterAddressEth(CONTRACTS.DEVNET.bsc.core),
+          getEmitterAddressEth(CONTRACTS.DEVNET.bsc.token_bridge),
           sequence
-        )
-      ).rejects.toThrow();
+        );
+        expect(Object.keys(transferStatus)).toContain("pending");
+        expect(Object.keys(transferStatus)).not.toContain("committed");
+      } else {
+        await expect(
+          fetchGlobalAccountantTransferStatus(
+            CHAIN_ID_BSC,
+            getEmitterAddressEth(CONTRACTS.DEVNET.bsc.token_bridge),
+            sequence
+          )
+        ).rejects.toThrow();
+      }
     }
     console.log("success!");
   });

diff --git a/wormchain/contracts/tools/__tests__/test_ntt_accountant.ts b/wormchain/contracts/tools/__tests__/test_ntt_accountant.ts
@@ -144,9 +144,11 @@ let client: any;
 let signer: string;
 let ethProvider: ethers.providers.WebSocketProvider;
 let ethSigner: ethers.Wallet;
+let fauxEthProvider: ethers.providers.WebSocketProvider;
 let fauxEthSigner: ethers.Wallet;
 let bscProvider: ethers.providers.WebSocketProvider;
 let bscSigner: ethers.Wallet;
+let fauxBscProvider: ethers.providers.WebSocketProvider;
 let fauxBscSigner: ethers.Wallet;
 let cosmWasmClient: CosmWasmClient;
 
@@ -158,17 +160,21 @@ beforeAll(async () => {
   // create a signer for Eth
   ethProvider = new ethers.providers.WebSocketProvider(ETH_NODE_URL);
   ethSigner = new ethers.Wallet(ETH_WALLET.private, ethProvider);
-  fauxEthSigner = new ethers.Wallet(BSC_WALLET.private, ethProvider);
+  fauxEthProvider = new ethers.providers.WebSocketProvider(ETH_NODE_URL);
+  fauxEthSigner = new ethers.Wallet(BSC_WALLET.private, fauxEthProvider);
   // create a signer for BSC
   bscProvider = new ethers.providers.WebSocketProvider(BSC_NODE_URL);
   bscSigner = new ethers.Wallet(BSC_WALLET.private, bscProvider);
-  fauxBscSigner = new ethers.Wallet(ETH_WALLET.private, bscProvider);
+  fauxBscProvider = new ethers.providers.WebSocketProvider(BSC_NODE_URL);
+  fauxBscSigner = new ethers.Wallet(ETH_WALLET.private, fauxBscProvider);
   cosmWasmClient = await CosmWasmClient.connect(TENDERMINT_URL);
 });
 
 afterAll(async () => {
   await ethProvider.destroy();
+  await fauxEthProvider.destroy();
   await bscProvider.destroy();
+  await fauxBscProvider.destroy();
   cosmWasmClient.disconnect();
 });
 
@@ -1068,13 +1074,23 @@ describe("Global Accountant Tests", () => {
         throw new Error("Expected metrics change did not occur");
       }
       // the transfer should fail, because there's an insufficient source balance
-      await expect(
-        fetchGlobalAccountantTransferStatus(
+      if (VAA_SIGNERS.length > 1) {
+        const transferStatus = await fetchGlobalAccountantTransferStatus(
           SPOKE_CHAIN_A,
           BSC_WALLET_EMITTER,
           sequence
-        )
-      ).rejects.toThrow();
+        );
+        expect(Object.keys(transferStatus)).toContain("pending");
+        expect(Object.keys(transferStatus)).not.toContain("committed");
+      } else {
+        await expect(
+          fetchGlobalAccountantTransferStatus(
+            SPOKE_CHAIN_A,
+            BSC_WALLET_EMITTER,
+            sequence
+          )
+        ).rejects.toThrow();
+      }
     });
     test("c. Ensure a token can be sent back to its hub endpoint", async () => {
       const beforeMetrics = await fetchGlobalAccountantMetrics();
@@ -1457,13 +1473,23 @@ describe("Global Accountant Tests", () => {
         throw new Error("Expected metrics change did not occur");
       }
       // the transfer should fail, because there's an insufficient source balance
-      await expect(
-        fetchGlobalAccountantTransferStatus(
+      if (VAA_SIGNERS.length > 1) {
+        const transferStatus = await fetchGlobalAccountantTransferStatus(
           SPOKE_CHAIN_A,
           BSC_WALLET_EMITTER,
           sequence
-        )
-      ).rejects.toThrow();
+        );
+        expect(Object.keys(transferStatus)).toContain("pending");
+        expect(Object.keys(transferStatus)).not.toContain("committed");
+      } else {
+        await expect(
+          fetchGlobalAccountantTransferStatus(
+            SPOKE_CHAIN_A,
+            BSC_WALLET_EMITTER,
+            sequence
+          )
+        ).rejects.toThrow();
+      }
     });
     test("k. Relayed message gets accounted", async () => {
       const beforeMetrics = await fetchGlobalAccountantMetrics();