Merge branch 'main' of github.com:neutron-org/neutron-integration-tes…

…ts into feat/add-new-voting-registry-tests
neutron-org · Sep 21, 2023 · b554ba7 · b554ba7
2 parents 889fca4 + 7b6ad41
commit b554ba7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/src/testcases/parallel/governance.test.ts b/src/testcases/parallel/governance.test.ts
@@ -92,47 +92,47 @@ describe('Neutron / Governance', () => {
 
   describe('prepare: bond funds', () => {
     test('bond form wallet 1', async () => {
-      await daoMember1.bondFunds('1000000000');
+      await daoMember1.bondFunds('10000');
       await wait.getWithAttempts(
         neutronChain.blockWaiter,
         async () =>
           await mainDao.queryVotingPower(
             daoMember1.user.wallet.address.toString(),
           ),
-        async (response) => response.power == 1000000000,
+        async (response) => response.power == 10000,
         20,
       );
     });
     test('bond from wallet 2', async () => {
-      await daoMember2.bondFunds('1000000000');
+      await daoMember2.bondFunds('10000');
       await wait.getWithAttempts(
         neutronChain.blockWaiter,
         async () =>
           await mainDao.queryVotingPower(
             daoMember1.user.wallet.address.toString(),
           ),
-        async (response) => response.power == 1000000000,
+        async (response) => response.power == 10000,
         20,
       );
     });
     test('bond from wallet 3 ', async () => {
-      await daoMember3.bondFunds('1000000000');
+      await daoMember3.bondFunds('10000');
       await wait.getWithAttempts(
         neutronChain.blockWaiter,
         async () =>
           await mainDao.queryVotingPower(
             daoMember1.user.wallet.address.toString(),
           ),
-        async (response) => response.power == 1000000000,
+        async (response) => response.power == 10000,
         20,
       );
     });
     test('check voting power', async () => {
       await wait.getWithAttempts(
         neutronChain.blockWaiter,
         async () => await mainDao.queryTotalVotingPower(),
-        // 3x1000000000 + 100000000 from investors vault (see neutron/network/init-neutrond.sh)
-        async (response) => response.power == 3100000000,
+        // 3x10000 + 1000 from investors vault (see neutron/network/init-neutrond.sh)
+        async (response) => response.power == 31000,
         20,
       );
     });

diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts
@@ -794,32 +794,28 @@ describe('Neutron / Interchain TXs', () => {
         expect(failures.failures).toEqual([
           {
             channel_id: 'channel-3',
-            address:
-              'neutron1m0z0kk0qqug74n9u9ul23e28x5fszr628h20xwt6jywjpp64xn4qatgvm0',
+            address: contractAddress,
             id: '0',
             ack_id: '2',
             ack_type: 'ack',
           },
           {
             channel_id: 'channel-3',
-            address:
-              'neutron1m0z0kk0qqug74n9u9ul23e28x5fszr628h20xwt6jywjpp64xn4qatgvm0',
+            address: contractAddress,
             id: '1',
             ack_id: '3',
             ack_type: 'ack',
           },
           {
             channel_id: 'channel-3',
-            address:
-              'neutron1m0z0kk0qqug74n9u9ul23e28x5fszr628h20xwt6jywjpp64xn4qatgvm0',
+            address: contractAddress,
             id: '2',
             ack_id: '4',
             ack_type: 'ack',
           },
           {
             channel_id: 'channel-3',
-            address:
-              'neutron1m0z0kk0qqug74n9u9ul23e28x5fszr628h20xwt6jywjpp64xn4qatgvm0',
+            address: contractAddress,
             id: '3',
             ack_id: '5',
             ack_type: 'timeout',

diff --git a/src/testcases/run_in_band/tge.auction.test.ts b/src/testcases/run_in_band/tge.auction.test.ts
@@ -1647,7 +1647,7 @@ describe('Neutron / TGE / Auction', () => {
 
         it('add lockdrop vault to the registry', async () => {
           let tvp = await daoMain.queryTotalVotingPower();
-          expect(tvp.power | 0).toBe(1000);
+          expect(tvp.power | 0).toBe(2000); // the bonded 1000 + 1000 from investors vault (see neutron/network/init-neutrond.sh)
           const propID = await daoMember1.submitSingleChoiceProposal(
             'Proposal #1',
             'add LOCKDROP_VAULT',
@@ -1668,8 +1668,9 @@ describe('Neutron / TGE / Auction', () => {
           );
           await daoMember1.voteYes(propID);
           await daoMember1.executeProposal(propID);
+          await neutronChain.blockWaiter.waitBlocks(2); // wait for a couple of blocks so the vault becomes active
           tvp = await daoMain.queryTotalVotingPower();
-          expect(tvp.power | 0).toBeGreaterThan(1000);
+          expect(tvp.power | 0).toBeGreaterThan(2000);
           // lockdrop participants get voting power
           for (const v of [
             'airdropAuctionLockdrop',
@@ -1734,6 +1735,7 @@ describe('Neutron / TGE / Auction', () => {
             }
           }
           await daoMember1.executeProposal(propID);
+          await neutronChain.blockWaiter.waitBlocks(2); // wait for a couple of blocks so the vault becomes active
           const tvpNew = await daoMain.queryTotalVotingPower();
           expect(tvpNew.power | 0).toBeGreaterThan(tvp.power | 0);
           // vesting participants get(increase) the voting power
@@ -1792,6 +1794,7 @@ describe('Neutron / TGE / Auction', () => {
             }
           }
           await daoMember1.executeProposal(propID);
+          await neutronChain.blockWaiter.waitBlocks(2); // wait for a couple of blocks so the vault becomes active
           const tvpNew = await daoMain.queryTotalVotingPower();
           expect(tvpNew.power | 0).toBeGreaterThan(tvp.power | 0);
           // airdrop participants get(increase) the voting power