From 22cba193316d06a7a552f9ba1e3f59069ce66ca7 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Tue, 19 Sep 2023 18:12:06 +0300 Subject: [PATCH 1/4] describe expected total voting power --- src/testcases/parallel/governance.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/testcases/parallel/governance.test.ts b/src/testcases/parallel/governance.test.ts index 057da3de..417a3a94 100644 --- a/src/testcases/parallel/governance.test.ts +++ b/src/testcases/parallel/governance.test.ts @@ -131,6 +131,7 @@ describe('Neutron / Governance', () => { 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, 20, ); From 234e7810d64600e7373e9f32552d33b0526fe7c1 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 20 Sep 2023 14:32:22 +0300 Subject: [PATCH 2/4] add pause between vault add and VP check and adapt VP checks --- src/testcases/run_in_band/tge.auction.test.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/testcases/run_in_band/tge.auction.test.ts b/src/testcases/run_in_band/tge.auction.test.ts index 74b6d66f..465de2d9 100644 --- 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 From 639d39f25768d37774a7c1197a43e40fd11879b2 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 20 Sep 2023 14:32:56 +0300 Subject: [PATCH 3/4] decrease bond amount for dao members --- src/testcases/parallel/governance.test.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/testcases/parallel/governance.test.ts b/src/testcases/parallel/governance.test.ts index 417a3a94..8cd74939 100644 --- a/src/testcases/parallel/governance.test.ts +++ b/src/testcases/parallel/governance.test.ts @@ -92,38 +92,38 @@ 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, ); }); @@ -131,8 +131,8 @@ describe('Neutron / Governance', () => { 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, ); }); From 2a2e65c745ccde970c41ca15e09f80624febf1d5 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 20 Sep 2023 15:46:30 +0300 Subject: [PATCH 4/4] reuse contractAddress instead of hardcoded address --- src/testcases/run_in_band/interchaintx.test.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index c5bf8dc4..c6f81c2e 100644 --- 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',