From 891e5158657e01292f3221a02d20931855c3500d Mon Sep 17 00:00:00 2001 From: Troy Kessler Date: Mon, 23 Dec 2024 14:47:57 +0100 Subject: [PATCH] chore: finished valaccount renaming --- proto/kyve/stakers/v1beta1/genesis.proto | 2 +- testutil/integration/checks.go | 4 +- testutil/integration/helpers.go | 10 +- testutil/integration/integration.go | 62 +-- x/bundles/keeper/abci_protocol_split_test.go | 16 +- .../keeper_suite_dropped_bundles_test.go | 38 +- .../keeper_suite_funding_bundles_test.go | 72 ++-- .../keeper_suite_inflation_splitting_test.go | 122 +++--- .../keeper_suite_invalid_bundles_test.go | 242 ++++++------ x/bundles/keeper/keeper_suite_points_test.go | 84 ++--- .../keeper/keeper_suite_stakers_leave_test.go | 78 ++-- .../keeper/keeper_suite_valid_bundles_test.go | 356 +++++++++--------- .../keeper_suite_zero_delegation_test.go | 132 +++---- x/bundles/keeper/logic_bundles_test.go | 142 +++---- ...ic_end_block_handle_upload_timeout_test.go | 118 +++--- .../msg_server_claim_uploader_role_test.go | 20 +- .../msg_server_skip_uploader_role_test.go | 38 +- .../msg_server_submit_bundle_proposal_test.go | 26 +- .../msg_server_vote_bundle_proposal_test.go | 28 +- .../keeper/msg_server_redelegate_test.go | 2 +- .../keeper/msg_server_undelegate_test.go | 2 +- x/pool/keeper/msg_server_disable_pool_test.go | 18 +- .../keeper/grpc_account_redelegation_test.go | 2 +- x/query/keeper/grpc_query_can_propose_test.go | 58 +-- .../keeper/grpc_query_can_validate_test.go | 12 +- x/query/keeper/grpc_query_can_vote_test.go | 62 +-- x/query/keeper/helper.go | 6 +- .../keeper_suite_effective_stake_test.go | 74 ++-- x/stakers/keeper/msg_server_join_pool_test.go | 224 +++++------ .../keeper/msg_server_leave_pool_test.go | 76 ++-- .../msg_server_update_commission_test.go | 20 +- .../msg_server_update_stake_fraction_test.go | 20 +- x/stakers/spec/01_concepts.md | 4 +- x/stakers/spec/02_state.md | 4 +- x/stakers/spec/07_exported.md | 8 +- x/stakers/types/genesis.go | 8 +- x/stakers/types/genesis.pb.go | 2 +- 37 files changed, 1094 insertions(+), 1098 deletions(-) diff --git a/proto/kyve/stakers/v1beta1/genesis.proto b/proto/kyve/stakers/v1beta1/genesis.proto index 8de9b6f2..e8d7442a 100644 --- a/proto/kyve/stakers/v1beta1/genesis.proto +++ b/proto/kyve/stakers/v1beta1/genesis.proto @@ -14,7 +14,7 @@ message GenesisState { Params params = 1 [(gogoproto.nullable) = false]; // staker_list ... repeated Staker staker_list = 2 [(gogoproto.nullable) = false]; - // valaccount_list ... + // pool_account_list ... repeated PoolAccount pool_account_list = 3 [(gogoproto.nullable) = false]; // commission_change_entries ... repeated CommissionChangeEntry commission_change_entries = 4 [(gogoproto.nullable) = false]; diff --git a/testutil/integration/checks.go b/testutil/integration/checks.go index d4a18fbc..a69a1216 100644 --- a/testutil/integration/checks.go +++ b/testutil/integration/checks.go @@ -123,10 +123,10 @@ func (suite *KeeperTestSuite) VerifyPoolQueries() { Expect(poolByIdQuery.Pool.TotalDelegation).To(Equal(totalDelegationState)) // test stakers by pool - valaccounts := suite.App().StakersKeeper.GetAllPoolAccountsOfPool(suite.Ctx(), poolsState[i].Id) + poolAccounts := suite.App().StakersKeeper.GetAllPoolAccountsOfPool(suite.Ctx(), poolsState[i].Id) stakersByPoolState := make([]querytypes.FullStaker, 0) - for _, poolAccount := range valaccounts { + for _, poolAccount := range poolAccounts { if _, stakerFound := suite.App().StakersKeeper.GetValidator(suite.Ctx(), poolAccount.Staker); stakerFound { stakersByPoolState = append(stakersByPoolState, *suite.App().QueryKeeper.GetFullStaker(suite.Ctx(), poolAccount.Staker)) } diff --git a/testutil/integration/helpers.go b/testutil/integration/helpers.go index afe0ab59..1f70f2e7 100644 --- a/testutil/integration/helpers.go +++ b/testutil/integration/helpers.go @@ -66,22 +66,22 @@ func (suite *KeeperTestSuite) GetCoinsFromModule(moduleName string) sdk.Coins { return suite.App().BankKeeper.GetAllBalances(suite.Ctx(), moduleAcc) } -func (suite *KeeperTestSuite) GetNextUploader() (nextStaker string, nextValaddress string) { +func (suite *KeeperTestSuite) GetNextUploader() (nextStaker string, nextPoolAddress string) { bundleProposal, _ := suite.App().BundlesKeeper.GetBundleProposal(suite.Ctx(), 0) switch bundleProposal.NextUploader { case STAKER_0: nextStaker = STAKER_0 - nextValaddress = VALADDRESS_0_A + nextPoolAddress = POOL_ADDRESS_0_A case STAKER_1: nextStaker = STAKER_1 - nextValaddress = VALADDRESS_1_A + nextPoolAddress = POOL_ADDRESS_1_A case STAKER_2: nextStaker = STAKER_2 - nextValaddress = VALADDRESS_2_A + nextPoolAddress = POOL_ADDRESS_2_A default: nextStaker = "" - nextValaddress = "" + nextPoolAddress = "" } return diff --git a/testutil/integration/integration.go b/testutil/integration/integration.go index 20dc25d9..366fd8bc 100644 --- a/testutil/integration/integration.go +++ b/testutil/integration/integration.go @@ -30,25 +30,25 @@ const ( CHARLIE = "kyve1ay22rr3kz659fupu0tcswlagq4ql6rwm4nuv0s" DAVID = "kyve1jxa7kp37jlm8hzwgc5qprquv9k7vawq79qhctt" - STAKER_0 = "kyve1htgfatqevuvfzvl0sxp97ywteqhg5leha9emf4" - VALADDRESS_0_A = "kyve1qnf86dkvvtpdukx30r3vajav7rdq8snktm90hm" - VALADDRESS_0_B = "kyve10t8gnqjnem7tsu09erzswj3zm8599lsnex79rz" - VALADDRESS_0_C = "kyve13ztkcm2pket6mrmxj8rrmwc6supw7aqakg3uu3" - - STAKER_1 = "kyve1gnr35rwn8rmflnlzs6nn5hhkmzzkxg9ap8xepw" - VALADDRESS_1_A = "kyve1hpjgzljglmv00nstk3jvcw0zzq94nu0cuxv5ga" - VALADDRESS_1_B = "kyve14runw9qkltpz2mcx3gsfmlqyyvdzkt3rq3w6fm" - VALADDRESS_1_C = "kyve15w9m7zpq9ctsxsveqaqkp4uuvw98z5vct6s9g9" - - STAKER_2 = "kyve1xsemlxghgvusumhqzm2ztjw7dz9krvu3de54e2" - VALADDRESS_2_A = "kyve1u0870dkae6ql63hxvy9y7g65c0y8csfh8allzl" - VALADDRESS_2_B = "kyve16g3utghkvvlz53jk0fq96zwrhxmqfu36ue965q" - VALADDRESS_2_C = "kyve18gjtzsn6jme3qsczj9q7wefymlkfu7ngyq5f9c" - - STAKER_3 = "kyve1ca7rzyrxfpdm7j8jgccq4rduuf4sxpq0dhmwm4" - VALADDRESS_3_A = "kyve1d2clkfrw0r99ctgmkjvluzn6xm98yls06mnxv8" - VALADDRESS_3_B = "kyve1f36cvde6jnygcrz2yas4acp0akn9cw7vp5ze0w" - VALADDRESS_3_C = "kyve1gcnd8gya2ysfur6d6z4wpl9z54zadg7qzk8uyc" + STAKER_0 = "kyve1htgfatqevuvfzvl0sxp97ywteqhg5leha9emf4" + POOL_ADDRESS_0_A = "kyve1qnf86dkvvtpdukx30r3vajav7rdq8snktm90hm" + POOL_ADDRESS_0_B = "kyve10t8gnqjnem7tsu09erzswj3zm8599lsnex79rz" + POOL_ADDRESS_0_C = "kyve13ztkcm2pket6mrmxj8rrmwc6supw7aqakg3uu3" + + STAKER_1 = "kyve1gnr35rwn8rmflnlzs6nn5hhkmzzkxg9ap8xepw" + POOL_ADDRESS_1_A = "kyve1hpjgzljglmv00nstk3jvcw0zzq94nu0cuxv5ga" + POOL_ADDRESS_1_B = "kyve14runw9qkltpz2mcx3gsfmlqyyvdzkt3rq3w6fm" + POOL_ADDRESS_1_C = "kyve15w9m7zpq9ctsxsveqaqkp4uuvw98z5vct6s9g9" + + STAKER_2 = "kyve1xsemlxghgvusumhqzm2ztjw7dz9krvu3de54e2" + POOL_ADDRESS_2_A = "kyve1u0870dkae6ql63hxvy9y7g65c0y8csfh8allzl" + POOL_ADDRESS_2_B = "kyve16g3utghkvvlz53jk0fq96zwrhxmqfu36ue965q" + POOL_ADDRESS_2_C = "kyve18gjtzsn6jme3qsczj9q7wefymlkfu7ngyq5f9c" + + STAKER_3 = "kyve1ca7rzyrxfpdm7j8jgccq4rduuf4sxpq0dhmwm4" + POOL_ADDRESS_3_A = "kyve1d2clkfrw0r99ctgmkjvluzn6xm98yls06mnxv8" + POOL_ADDRESS_3_B = "kyve1f36cvde6jnygcrz2yas4acp0akn9cw7vp5ze0w" + POOL_ADDRESS_3_C = "kyve1gcnd8gya2ysfur6d6z4wpl9z54zadg7qzk8uyc" // To avoid giving burner permissions to a module for the tests BURNER = "kyve1ld23ktfwc9zstaq8aanwkkj8cf0ru6adtz59y5" @@ -124,24 +124,24 @@ func (suite *KeeperTestSuite) initDummyAccounts() { _ = suite.MintCoins(DAVID, 1000*KYVE) _ = suite.MintCoins(STAKER_0, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_0_A, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_0_B, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_0_C, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_0_A, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_0_B, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_0_C, 1000*KYVE) _ = suite.MintCoins(STAKER_1, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_1_A, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_1_B, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_1_C, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_1_A, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_1_B, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_1_C, 1000*KYVE) _ = suite.MintCoins(STAKER_2, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_2_A, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_2_B, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_2_C, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_2_A, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_2_B, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_2_C, 1000*KYVE) _ = suite.MintCoins(STAKER_3, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_3_A, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_3_B, 1000*KYVE) - _ = suite.MintCoins(VALADDRESS_3_C, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_3_A, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_3_B, 1000*KYVE) + _ = suite.MintCoins(POOL_ADDRESS_3_C, 1000*KYVE) DUMMY = make([]string, 50) diff --git a/x/bundles/keeper/abci_protocol_split_test.go b/x/bundles/keeper/abci_protocol_split_test.go index a4649996..5d746003 100644 --- a/x/bundles/keeper/abci_protocol_split_test.go +++ b/x/bundles/keeper/abci_protocol_split_test.go @@ -83,7 +83,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -93,7 +93,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -139,7 +139,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -147,7 +147,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -155,7 +155,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -163,7 +163,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 1, - PoolAddress: i.VALADDRESS_1_B, + PoolAddress: i.POOL_ADDRESS_1_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -206,7 +206,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -216,7 +216,7 @@ var _ = Describe("abci.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) diff --git a/x/bundles/keeper/keeper_suite_dropped_bundles_test.go b/x/bundles/keeper/keeper_suite_dropped_bundles_test.go index 3dc0041a..4479a236 100644 --- a/x/bundles/keeper/keeper_suite_dropped_bundles_test.go +++ b/x/bundles/keeper/keeper_suite_dropped_bundles_test.go @@ -24,10 +24,10 @@ var _ = Describe("dropped bundles", Ordered, func() { var s *i.KeeperTestSuite initialBalanceStaker0 := s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 := s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 := s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 := s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 := s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) BeforeEach(func() { // init new clean chain @@ -70,7 +70,7 @@ var _ = Describe("dropped bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -80,22 +80,22 @@ var _ = Describe("dropped bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) s.CommitAfterSeconds(60) }) @@ -111,7 +111,7 @@ var _ = Describe("dropped bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -119,7 +119,7 @@ var _ = Describe("dropped bundles", Ordered, func() { initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_2) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -171,25 +171,25 @@ var _ = Describe("dropped bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceValaddress := s.GetBalanceFromAddress(valaccountUploader.PoolAddress) - Expect(balanceValaddress).To(Equal(initialBalanceValaddress0)) + balancePoolAddress := s.GetBalanceFromAddress(poolAccountUploader.PoolAddress) + Expect(balancePoolAddress).To(Equal(initialBalancePoolAddress0)) - balanceUploader := s.GetBalanceFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetBalanceFromAddress(poolAccountUploader.Staker) Expect(balanceUploader).To(Equal(initialBalanceStaker0)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0)).To(BeEmpty()) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(Equal(uint64(1))) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(Equal(uint64(1))) - balanceVoterValaddress := s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) diff --git a/x/bundles/keeper/keeper_suite_funding_bundles_test.go b/x/bundles/keeper/keeper_suite_funding_bundles_test.go index ee595311..79be2cf4 100644 --- a/x/bundles/keeper/keeper_suite_funding_bundles_test.go +++ b/x/bundles/keeper/keeper_suite_funding_bundles_test.go @@ -109,7 +109,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -119,13 +119,13 @@ var _ = Describe("funding bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -147,7 +147,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -161,7 +161,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -172,7 +172,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -228,7 +228,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -242,7 +242,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -253,7 +253,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -315,7 +315,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -329,7 +329,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -340,7 +340,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -402,7 +402,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -416,7 +416,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -427,7 +427,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -483,7 +483,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -497,7 +497,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -508,7 +508,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -564,7 +564,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -578,7 +578,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -589,7 +589,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -643,7 +643,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -657,7 +657,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -668,7 +668,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -710,7 +710,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -724,7 +724,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -741,7 +741,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -780,7 +780,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -794,7 +794,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -805,7 +805,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -861,7 +861,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -875,7 +875,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -886,7 +886,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -941,7 +941,7 @@ var _ = Describe("funding bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -955,7 +955,7 @@ var _ = Describe("funding bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -966,7 +966,7 @@ var _ = Describe("funding bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", diff --git a/x/bundles/keeper/keeper_suite_inflation_splitting_test.go b/x/bundles/keeper/keeper_suite_inflation_splitting_test.go index 26b1ffc0..7a6e8d95 100644 --- a/x/bundles/keeper/keeper_suite_inflation_splitting_test.go +++ b/x/bundles/keeper/keeper_suite_inflation_splitting_test.go @@ -130,7 +130,7 @@ var _ = Describe("inflation splitting", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -140,13 +140,13 @@ var _ = Describe("inflation splitting", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -177,7 +177,7 @@ var _ = Describe("inflation splitting", Ordered, func() { } s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -191,7 +191,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -205,7 +205,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -261,7 +261,7 @@ var _ = Describe("inflation splitting", Ordered, func() { } s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -275,7 +275,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -288,7 +288,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -348,7 +348,7 @@ var _ = Describe("inflation splitting", Ordered, func() { } s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -362,7 +362,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -375,7 +375,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -448,7 +448,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -462,7 +462,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -476,7 +476,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -552,7 +552,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -566,7 +566,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -579,7 +579,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -650,7 +650,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -664,7 +664,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -677,7 +677,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -747,7 +747,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -761,7 +761,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -775,7 +775,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -850,7 +850,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -864,7 +864,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -877,7 +877,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -948,7 +948,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -962,7 +962,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -975,7 +975,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1046,7 +1046,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1060,7 +1060,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1074,7 +1074,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1149,7 +1149,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1163,7 +1163,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1176,7 +1176,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1247,7 +1247,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1261,7 +1261,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1274,7 +1274,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1345,7 +1345,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1359,7 +1359,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1373,7 +1373,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1448,7 +1448,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1462,7 +1462,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1476,7 +1476,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1558,7 +1558,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1572,7 +1572,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1586,7 +1586,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1658,7 +1658,7 @@ var _ = Describe("inflation splitting", Ordered, func() { } s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1672,7 +1672,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1685,7 +1685,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1764,14 +1764,14 @@ var _ = Describe("inflation splitting", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 1, - PoolAddress: i.VALADDRESS_1_B, + PoolAddress: i.POOL_ADDRESS_1_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -1783,7 +1783,7 @@ var _ = Describe("inflation splitting", Ordered, func() { } s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1797,7 +1797,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1810,7 +1810,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1922,7 +1922,7 @@ var _ = Describe("inflation splitting", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -1930,7 +1930,7 @@ var _ = Describe("inflation splitting", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 1, - PoolAddress: i.VALADDRESS_1_B, + PoolAddress: i.POOL_ADDRESS_1_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -1945,7 +1945,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // Prepare bundle proposal s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1959,7 +1959,7 @@ var _ = Describe("inflation splitting", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1972,7 +1972,7 @@ var _ = Describe("inflation splitting", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", diff --git a/x/bundles/keeper/keeper_suite_invalid_bundles_test.go b/x/bundles/keeper/keeper_suite_invalid_bundles_test.go index 2133969f..11387899 100644 --- a/x/bundles/keeper/keeper_suite_invalid_bundles_test.go +++ b/x/bundles/keeper/keeper_suite_invalid_bundles_test.go @@ -30,19 +30,19 @@ TEST CASES - invalid bundles var _ = Describe("invalid bundles", Ordered, func() { var s *i.KeeperTestSuite - var initialBalanceStaker0, initialBalanceValaddress0, initialBalanceStaker1, initialBalanceValaddress1, initialBalanceStaker2, initialBalanceValaddress2 uint64 + var initialBalanceStaker0, initialBalancePoolAddress0, initialBalanceStaker1, initialBalancePoolAddress1, initialBalanceStaker2, initialBalancePoolAddress2 uint64 BeforeEach(func() { // init new clean chain s = i.NewCleanChain() initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetBalanceFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetBalanceFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetBalanceFromAddress(i.POOL_ADDRESS_2_A) // create clean pool for every test case gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() @@ -79,13 +79,13 @@ var _ = Describe("invalid bundles", Ordered, func() { }) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetBalanceFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetBalanceFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetBalanceFromAddress(i.POOL_ADDRESS_2_A) }) AfterEach(func() { @@ -99,7 +99,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -109,7 +109,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -117,7 +117,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -135,23 +135,23 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetBalanceFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetBalanceFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetBalanceFromAddress(i.POOL_ADDRESS_2_A) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -159,7 +159,7 @@ var _ = Describe("invalid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -169,7 +169,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -219,8 +219,8 @@ var _ = Describe("invalid bundles", Ordered, func() { _, uploaderActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(uploaderActive).To(BeFalse()) - balanceValaddress := s.GetBalanceFromAddress(i.VALADDRESS_0_A) - Expect(balanceValaddress).To(Equal(initialBalanceValaddress0)) + balancePoolAddress := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + Expect(balancePoolAddress).To(Equal(initialBalancePoolAddress0)) balanceUploader := s.GetBalanceFromAddress(i.STAKER_0) @@ -238,25 +238,25 @@ var _ = Describe("invalid bundles", Ordered, func() { Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(200 * i.KYVE)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.STAKER_1)).To(BeEmpty()) // check voter 2 status - valaccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress = s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress = s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter = s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter = s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_2, i.STAKER_2)).To(BeEmpty()) @@ -276,7 +276,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -286,7 +286,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -308,7 +308,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -322,7 +322,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -336,17 +336,17 @@ var _ = Describe("invalid bundles", Ordered, func() { }) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetBalanceFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetBalanceFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetBalanceFromAddress(i.POOL_ADDRESS_2_A) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -354,7 +354,7 @@ var _ = Describe("invalid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -364,7 +364,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -414,8 +414,8 @@ var _ = Describe("invalid bundles", Ordered, func() { _, uploaderActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(uploaderActive).To(BeFalse()) - balanceValaddress := s.GetBalanceFromAddress(i.VALADDRESS_0_A) - Expect(balanceValaddress).To(Equal(initialBalanceValaddress0)) + balancePoolAddress := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + Expect(balancePoolAddress).To(Equal(initialBalancePoolAddress0)) balanceUploader := s.GetBalanceFromAddress(i.STAKER_0) _, uploaderFound := s.App().StakersKeeper.GetValidator(s.Ctx(), i.STAKER_0) @@ -437,25 +437,25 @@ var _ = Describe("invalid bundles", Ordered, func() { Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(400 * i.KYVE)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.STAKER_1)).To(BeEmpty()) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.BOB)).To(BeEmpty()) // check voter 2 status - valaccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress = s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress = s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter = s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter = s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.STAKER_1)).To(BeEmpty()) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.BOB)).To(BeEmpty()) @@ -475,7 +475,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -485,7 +485,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -507,7 +507,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -523,7 +523,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_3, PoolId: 0, - PoolAddress: i.VALADDRESS_3_A, + PoolAddress: i.POOL_ADDRESS_3_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -538,7 +538,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -552,17 +552,17 @@ var _ = Describe("invalid bundles", Ordered, func() { }) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetBalanceFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetBalanceFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetBalanceFromAddress(i.POOL_ADDRESS_2_A) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -570,7 +570,7 @@ var _ = Describe("invalid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -578,7 +578,7 @@ var _ = Describe("invalid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_3_A, + Creator: i.POOL_ADDRESS_3_A, Staker: i.STAKER_3, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -588,7 +588,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -638,8 +638,8 @@ var _ = Describe("invalid bundles", Ordered, func() { _, uploaderActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(uploaderActive).To(BeFalse()) - balanceValaddress := s.GetBalanceFromAddress(i.VALADDRESS_0_A) - Expect(balanceValaddress).To(Equal(initialBalanceValaddress0)) + balancePoolAddress := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + Expect(balancePoolAddress).To(Equal(initialBalancePoolAddress0)) balanceUploader := s.GetBalanceFromAddress(i.STAKER_0) _, uploaderFound := s.App().StakersKeeper.GetValidator(s.Ctx(), i.STAKER_0) @@ -672,8 +672,8 @@ var _ = Describe("invalid bundles", Ordered, func() { _, voterActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) Expect(voterActive).To(BeFalse()) - balanceVoterValaddress := s.GetBalanceFromAddress(i.VALADDRESS_1_A) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress2)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress2)) balanceVoter := s.GetBalanceFromAddress(i.STAKER_1) Expect(balanceVoter).To(Equal(initialBalanceStaker2)) @@ -681,25 +681,25 @@ var _ = Describe("invalid bundles", Ordered, func() { Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.BOB)).To(BeEmpty()) // check voter2 status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress = s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress = s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter = s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter = s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_2, i.STAKER_2)).To(BeEmpty()) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_2, i.CHARLIE)).To(BeEmpty()) // check voter3 status - valaccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_3, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_3, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress = s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress = s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter = s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter = s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_3, i.STAKER_3)).To(BeEmpty()) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_3, i.DAVID)).To(BeEmpty()) @@ -719,7 +719,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.5"), }) @@ -729,7 +729,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -737,7 +737,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -755,23 +755,23 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetBalanceFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetBalanceFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetBalanceFromAddress(i.POOL_ADDRESS_2_A) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -779,7 +779,7 @@ var _ = Describe("invalid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -789,7 +789,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -839,8 +839,8 @@ var _ = Describe("invalid bundles", Ordered, func() { _, uploaderActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(uploaderActive).To(BeFalse()) - balanceValaddress := s.GetBalanceFromAddress(i.VALADDRESS_0_A) - Expect(balanceValaddress).To(Equal(initialBalanceValaddress0)) + balancePoolAddress := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + Expect(balancePoolAddress).To(Equal(initialBalancePoolAddress0)) balanceUploader := s.GetBalanceFromAddress(i.STAKER_0) @@ -858,25 +858,25 @@ var _ = Describe("invalid bundles", Ordered, func() { Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(200 * i.KYVE)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.STAKER_1)).To(BeEmpty()) // check voter 2 status - valaccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress = s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress = s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter = s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter = s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_2, i.STAKER_2)).To(BeEmpty()) @@ -902,7 +902,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.5"), }) @@ -912,7 +912,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -920,7 +920,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -938,23 +938,23 @@ var _ = Describe("invalid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetBalanceFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetBalanceFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetBalanceFromAddress(i.POOL_ADDRESS_2_A) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -962,7 +962,7 @@ var _ = Describe("invalid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -972,7 +972,7 @@ var _ = Describe("invalid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1022,8 +1022,8 @@ var _ = Describe("invalid bundles", Ordered, func() { _, uploaderActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(uploaderActive).To(BeFalse()) - balanceValaddress := s.GetBalanceFromAddress(i.VALADDRESS_0_A) - Expect(balanceValaddress).To(Equal(initialBalanceValaddress0)) + balancePoolAddress := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + Expect(balancePoolAddress).To(Equal(initialBalancePoolAddress0)) balanceUploader := s.GetBalanceFromAddress(i.STAKER_0) @@ -1043,25 +1043,25 @@ var _ = Describe("invalid bundles", Ordered, func() { Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(200 * i.KYVE)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.STAKER_1)).To(BeEmpty()) // check voter 2 status - valaccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress = s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress = s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter = s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter = s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_2, i.STAKER_2)).To(BeEmpty()) diff --git a/x/bundles/keeper/keeper_suite_points_test.go b/x/bundles/keeper/keeper_suite_points_test.go index b10d885c..5e47129b 100644 --- a/x/bundles/keeper/keeper_suite_points_test.go +++ b/x/bundles/keeper/keeper_suite_points_test.go @@ -70,7 +70,7 @@ var _ = Describe("points", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -80,7 +80,7 @@ var _ = Describe("points", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -90,7 +90,7 @@ var _ = Describe("points", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -103,7 +103,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), pool) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -117,7 +117,7 @@ var _ = Describe("points", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -136,7 +136,7 @@ var _ = Describe("points", Ordered, func() { // do not vote s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -150,8 +150,8 @@ var _ = Describe("points", Ordered, func() { }) // ASSERT - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(Equal(uint64(1))) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(Equal(uint64(1))) }) It("One validator votes after having not voted previously", func() { @@ -159,7 +159,7 @@ var _ = Describe("points", Ordered, func() { // do not vote s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -174,7 +174,7 @@ var _ = Describe("points", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -184,7 +184,7 @@ var _ = Describe("points", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -198,8 +198,8 @@ var _ = Describe("points", Ordered, func() { }) // ASSERT - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(BeZero()) }) It("One validator does not vote for multiple proposals in a row", func() { @@ -211,7 +211,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -225,7 +225,7 @@ var _ = Describe("points", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -238,8 +238,8 @@ var _ = Describe("points", Ordered, func() { } // ASSERT - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(Equal(uint64(3))) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(Equal(uint64(3))) }) It("One validator votes after having not voted previously multiple times", func() { @@ -251,7 +251,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -265,7 +265,7 @@ var _ = Describe("points", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -279,7 +279,7 @@ var _ = Describe("points", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -289,7 +289,7 @@ var _ = Describe("points", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -303,8 +303,8 @@ var _ = Describe("points", Ordered, func() { }) // ASSERT - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(BeZero()) }) It("One validator does not vote for multiple proposals and reaches max points", func() { @@ -319,7 +319,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -333,7 +333,7 @@ var _ = Describe("points", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -352,8 +352,8 @@ var _ = Describe("points", Ordered, func() { _, stakerFound := s.App().StakersKeeper.GetValidator(s.Ctx(), i.STAKER_2) Expect(stakerFound).To(BeTrue()) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountActive).To(BeFalse()) // check if voter got slashed slashAmountRatio := s.App().StakersKeeper.GetTimeoutSlash(s.Ctx()) @@ -371,7 +371,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -385,7 +385,7 @@ var _ = Describe("points", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -404,7 +404,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -418,9 +418,9 @@ var _ = Describe("points", Ordered, func() { }) // ASSERT - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) // points are instantly 1 because node did not vote on this bundle, too - Expect(valaccountVoter.Points).To(Equal(uint64(1))) + Expect(poolAccountVoter.Points).To(Equal(uint64(1))) }) It("One validator does not vote for multiple proposals and skip the uploader role", func() { @@ -432,7 +432,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -446,7 +446,7 @@ var _ = Describe("points", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -465,15 +465,15 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSkipUploaderRole{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, FromIndex: 400, }) // ASSERT - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) }) It("One validator submits a bundle proposal where he reaches max points because he did not vote before", func() { @@ -487,7 +487,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -501,7 +501,7 @@ var _ = Describe("points", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -520,7 +520,7 @@ var _ = Describe("points", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -534,8 +534,8 @@ var _ = Describe("points", Ordered, func() { }) // ASSERT - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) // points are instantly 1 because node did not vote on this bundle, too - Expect(valaccountVoter.Points).To(Equal(uint64(1))) + Expect(poolAccountVoter.Points).To(Equal(uint64(1))) }) }) diff --git a/x/bundles/keeper/keeper_suite_stakers_leave_test.go b/x/bundles/keeper/keeper_suite_stakers_leave_test.go index 52cd2acc..b056d4e6 100644 --- a/x/bundles/keeper/keeper_suite_stakers_leave_test.go +++ b/x/bundles/keeper/keeper_suite_stakers_leave_test.go @@ -77,7 +77,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -87,13 +87,13 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -113,7 +113,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -137,8 +137,8 @@ var _ = Describe("stakers leave", Ordered, func() { Expect(poolStakers).To(HaveLen(2)) Expect(poolStakers[0]).To(Equal(i.STAKER_1)) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountActive).To(BeFalse()) Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(200 * i.KYVE)) @@ -153,7 +153,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -161,7 +161,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -175,7 +175,7 @@ var _ = Describe("stakers leave", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -183,7 +183,7 @@ var _ = Describe("stakers leave", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -202,7 +202,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -225,8 +225,8 @@ var _ = Describe("stakers leave", Ordered, func() { Expect(poolStakers).To(HaveLen(2)) Expect(poolStakers[0]).To(Equal(i.STAKER_1)) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountActive).To(BeFalse()) Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(200 * i.KYVE)) @@ -264,7 +264,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -272,7 +272,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -286,7 +286,7 @@ var _ = Describe("stakers leave", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -294,7 +294,7 @@ var _ = Describe("stakers leave", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -313,7 +313,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -336,8 +336,8 @@ var _ = Describe("stakers leave", Ordered, func() { Expect(poolStakers).To(HaveLen(2)) Expect(poolStakers[0]).To(Equal(i.STAKER_1)) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountActive).To(BeFalse()) // check if next uploader got slashed fraction := s.App().StakersKeeper.GetUploadSlash(s.Ctx()) @@ -362,7 +362,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -370,7 +370,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -386,7 +386,7 @@ var _ = Describe("stakers leave", Ordered, func() { initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -394,7 +394,7 @@ var _ = Describe("stakers leave", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -413,7 +413,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -436,8 +436,8 @@ var _ = Describe("stakers leave", Ordered, func() { Expect(poolStakers).To(HaveLen(2)) Expect(poolStakers[0]).To(Equal(i.STAKER_0)) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountActive).To(BeFalse()) // check if voter got slashed fraction := s.App().StakersKeeper.GetVoteSlash(s.Ctx()) @@ -462,7 +462,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -470,7 +470,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -484,7 +484,7 @@ var _ = Describe("stakers leave", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -507,7 +507,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -530,8 +530,8 @@ var _ = Describe("stakers leave", Ordered, func() { Expect(poolStakers).To(HaveLen(2)) Expect(poolStakers[0]).To(Equal(i.STAKER_0)) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountActive).To(BeFalse()) // check if voter status @@ -554,7 +554,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -570,7 +570,7 @@ var _ = Describe("stakers leave", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -584,7 +584,7 @@ var _ = Describe("stakers leave", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -603,7 +603,7 @@ var _ = Describe("stakers leave", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "18SRvVuCrB8vy_OCLBaNbXONMVGeflGcw4gGTZ1oUt4", @@ -626,8 +626,8 @@ var _ = Describe("stakers leave", Ordered, func() { Expect(poolStakers).To(HaveLen(2)) Expect(poolStakers[0]).To(Equal(i.STAKER_0)) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountActive).To(BeFalse()) // check if voter not got slashed Expect(s.App().StakersKeeper.GetDelegationAmountOfDelegator(s.Ctx(), i.STAKER_1, i.STAKER_1)).To(Equal(100 * i.KYVE)) diff --git a/x/bundles/keeper/keeper_suite_valid_bundles_test.go b/x/bundles/keeper/keeper_suite_valid_bundles_test.go index 74ff2b66..c5870acd 100644 --- a/x/bundles/keeper/keeper_suite_valid_bundles_test.go +++ b/x/bundles/keeper/keeper_suite_valid_bundles_test.go @@ -36,7 +36,7 @@ TEST CASES - valid bundles var _ = Describe("valid bundles", Ordered, func() { var s *i.KeeperTestSuite - var initialBalanceStaker0, initialBalanceValaddress0, initialBalanceStaker1, initialBalanceValaddress1, initialBalanceStaker2, initialBalanceValaddress2 sdk.Coins + var initialBalanceStaker0, initialBalancePoolAddress0, initialBalanceStaker1, initialBalancePoolAddress1, initialBalanceStaker2, initialBalancePoolAddress2 sdk.Coins amountPerBundle := int64(10_000) BeforeEach(func() { @@ -44,13 +44,13 @@ var _ = Describe("valid bundles", Ordered, func() { s = i.NewCleanChain() initialBalanceStaker0 = s.GetCoinsFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetCoinsFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetCoinsFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) initialBalanceStaker2 = s.GetCoinsFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetCoinsFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetCoinsFromAddress(i.POOL_ADDRESS_2_A) // create clean pool for every test case gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() @@ -122,7 +122,7 @@ var _ = Describe("valid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -132,22 +132,22 @@ var _ = Describe("valid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) initialBalanceStaker0 = s.GetCoinsFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetCoinsFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetCoinsFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) s.CommitAfterSeconds(60) }) @@ -159,7 +159,7 @@ var _ = Describe("valid bundles", Ordered, func() { It("Produce a valid bundle with multiple validators and no foreign delegations", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -173,7 +173,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -181,7 +181,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -189,7 +189,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -249,24 +249,24 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) @@ -277,7 +277,7 @@ var _ = Describe("valid bundles", Ordered, func() { // assert commission rewards // (total_bundle_payout - treasury_reward - storage_cost) * commission + storage_cost // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * 0.1 + (100 * 0.5) - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) fundingState, _ := s.App().FundersKeeper.GetFundingState(s.Ctx(), 0) @@ -305,7 +305,7 @@ var _ = Describe("valid bundles", Ordered, func() { )) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -319,7 +319,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -327,7 +327,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -335,7 +335,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -395,30 +395,30 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * 0.1 + (100 * 0.5) - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) // assert uploader self delegation rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * (1 - 0.1) * (1/4) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(i.ACoins(2216).String())) @@ -459,7 +459,7 @@ var _ = Describe("valid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -471,7 +471,7 @@ var _ = Describe("valid bundles", Ordered, func() { )) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -485,7 +485,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -493,7 +493,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -501,7 +501,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -561,30 +561,30 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) - Expect(valaccountVoter.Points).To(Equal(uint64(1))) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) + Expect(poolAccountVoter.Points).To(Equal(uint64(1))) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * 0.1 + (100 * 0.5) - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) // assert uploader self delegation rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * (1 - 0.1) * (1/4) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(i.ACoins(2216).String())) @@ -625,7 +625,7 @@ var _ = Describe("valid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -637,7 +637,7 @@ var _ = Describe("valid bundles", Ordered, func() { )) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -651,7 +651,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -659,7 +659,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -667,7 +667,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -675,7 +675,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -735,30 +735,30 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * 0.1 + (100 * 0.5) - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) // assert uploader self delegation rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * (1 - 0.1) * (1/4) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(i.ACoins(2216).String())) @@ -799,7 +799,7 @@ var _ = Describe("valid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -811,7 +811,7 @@ var _ = Describe("valid bundles", Ordered, func() { )) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -825,7 +825,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -833,7 +833,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -841,7 +841,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker2 = s.GetCoinsFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetCoinsFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetCoinsFromAddress(i.POOL_ADDRESS_2_A) c1 := s.GetCoinsFromCommunityPool() @@ -849,7 +849,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -909,11 +909,11 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // calculate voter slashes fraction := s.App().StakersKeeper.GetVoteSlash(s.Ctx()) @@ -929,20 +929,20 @@ var _ = Describe("valid bundles", Ordered, func() { _, voterActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) Expect(voterActive).To(BeFalse()) - balanceVoterValaddress := s.GetCoinsFromAddress(i.VALADDRESS_2_A) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress2)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(i.POOL_ADDRESS_2_A) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress2)) balanceVoter := s.GetCoinsFromAddress(i.STAKER_2) Expect(balanceVoter).To(Equal(initialBalanceStaker2)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * 0.1 + (100 * 0.5) - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) // assert uploader self delegation rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * (1 - 0.1) * (1/4) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(i.ACoins(2216).String())) @@ -973,7 +973,7 @@ var _ = Describe("valid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -990,13 +990,13 @@ var _ = Describe("valid bundles", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_3, PoolId: 0, - PoolAddress: i.VALADDRESS_3_A, + PoolAddress: i.POOL_ADDRESS_3_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -1004,7 +1004,7 @@ var _ = Describe("valid bundles", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1018,7 +1018,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1026,7 +1026,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1034,7 +1034,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_3_A, + Creator: i.POOL_ADDRESS_3_A, Staker: i.STAKER_3, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1042,7 +1042,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker2 = s.GetCoinsFromAddress(i.STAKER_2) - initialBalanceValaddress2 = s.GetCoinsFromAddress(i.VALADDRESS_2_A) + initialBalancePoolAddress2 = s.GetCoinsFromAddress(i.POOL_ADDRESS_2_A) c1 := s.GetCoinsFromCommunityPool() @@ -1051,7 +1051,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT // TODO: why is staker 2 selected as next uploader? s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1111,11 +1111,11 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // calculate voter slashes (due to maximum vote power only 200 kyve out of 400 where at risk for slashing) fraction := s.App().StakersKeeper.GetVoteSlash(s.Ctx()).Mul(math.LegacyMustNewDecFromStr("0.5")) // 200 / 400 @@ -1131,20 +1131,20 @@ var _ = Describe("valid bundles", Ordered, func() { _, voterActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 0) Expect(voterActive).To(BeFalse()) - balanceVoterValaddress := s.GetCoinsFromAddress(i.VALADDRESS_2_A) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress2)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(i.POOL_ADDRESS_2_A) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress2)) balanceVoter := s.GetCoinsFromAddress(i.STAKER_2) Expect(balanceVoter).To(Equal(initialBalanceStaker2)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * 0.1 + (100 * 0.5) - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(i.ACoins(1035).String())) // assert uploader self delegation rewards // (10_000 - (10_000 * 0.01) - (100 * 0.5)) * (1 - 0.1) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(i.ACoins(8865).String())) @@ -1176,7 +1176,7 @@ var _ = Describe("valid bundles", Ordered, func() { s.App().PoolKeeper.SetPool(s.Ctx(), pool) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1190,7 +1190,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1198,7 +1198,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -1206,7 +1206,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1266,24 +1266,24 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) @@ -1292,7 +1292,7 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(i.ACoins(8829).String())) // assert commission rewards // (10_000 - (10_000 * 0.01) - (100 * 0.9)) * 0.1 + (100 * 0.9) - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(i.ACoins(1071).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(i.ACoins(1071).String())) fundingState, _ := s.App().FundersKeeper.GetFundingState(s.Ctx(), 0) @@ -1315,7 +1315,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1329,7 +1329,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1337,7 +1337,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -1345,7 +1345,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1405,30 +1405,30 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards (here we round down since the result of commission rewards gets truncated) // (coin_amount_per_bundle - (coin_amount_per_bundle * 0.01) - _((100 * 0.5) / (3 * coin_weight))_) * 0.1 + _((100 * 0.5) / (3 * coin_weight))_ - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.ACoin(1004), i.BCoin(1987), i.CCoin(2974)).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.ACoin(1004), i.BCoin(1987), i.CCoin(2974)).String())) // assert uploader self delegation rewards (here we round up since the result of delegation rewards is the remainder minus the truncated commission rewards) // (coin_amount_per_bundle - (coin_amount_per_bundle * 0.01) - _((100 * 0.5) / (3 * coin_weight))_) * (1 - 0.1) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(sdk.NewCoins(i.ACoin(8896), i.BCoin(17813), i.CCoin(26726)).String())) @@ -1484,7 +1484,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1498,7 +1498,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1506,7 +1506,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -1514,7 +1514,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1574,30 +1574,30 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards (here we round down since the result of commission rewards gets truncated) // (10_000 - (10_000 * 0.01) - _((100 * 0.5) / (3 * coin_weight))_) * 0.1 + _((100 * 0.5) / (3 * coin_weight))_ - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.ACoin(1004), i.BCoin(997), i.CCoin(9900)).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.ACoin(1004), i.BCoin(997), i.CCoin(9900)).String())) // assert uploader self delegation rewards (here we round up since the result of delegation rewards is the remainder minus the truncated commission rewards) // (10_000 - (10_000 * 0.01) - _((100 * 0.5) / (3 * coin_weight))_) * (1 - 0.1) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(sdk.NewCoins(i.ACoin(8896), i.BCoin(8903)).String())) @@ -1647,7 +1647,7 @@ var _ = Describe("valid bundles", Ordered, func() { }, 0)) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1661,7 +1661,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1669,7 +1669,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -1677,7 +1677,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1737,30 +1737,30 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) // assert commission rewards (here we round down since the result of commission rewards gets truncated) // (10_000 - (10_000 * 0.01) - _((100 * 0.5) / (2 * coin_weight))_) * 0.1 + _((100 * 0.5) / (2 * coin_weight))_ - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.ACoin(1012), i.BCoin(1000)).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.ACoin(1012), i.BCoin(1000)).String())) // assert uploader self delegation rewards (here we round up since the result of delegation rewards is the remainder minus the truncated commission rewards) // (10_000 - (10_000 * 0.01) - _((100 * 0.5) / (2 * coin_weight))_) * (1 - 0.1) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(sdk.NewCoins(i.ACoin(8888), i.BCoin(8900)).String())) @@ -1842,7 +1842,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1856,7 +1856,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1864,7 +1864,7 @@ var _ = Describe("valid bundles", Ordered, func() { }) initialBalanceStaker1 = s.GetCoinsFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetCoinsFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetCoinsFromAddress(i.POOL_ADDRESS_1_A) c1 := s.GetCoinsFromCommunityPool() @@ -1872,7 +1872,7 @@ var _ = Describe("valid bundles", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1932,24 +1932,24 @@ var _ = Describe("valid bundles", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetCoinsFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetCoinsFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetCoinsFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetCoinsFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetCoinsFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetCoinsFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // check uploader rewards - balanceUploader := s.GetCoinsFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetCoinsFromAddress(poolAccountUploader.Staker) // assert payout transfer Expect(balanceUploader.String()).To(Equal(initialBalanceStaker0.String())) @@ -1957,7 +1957,7 @@ var _ = Describe("valid bundles", Ordered, func() { // (amount_per_bundle - treasury_reward - storage_cost) * uploader_commission + storage_cost // storage_cost = 1MB * storage_price / coin_length * coin_price // (amount_per_bundle - (amount_per_bundle * 0.01) - _((1048576 * 0.000000006288 * 10**coin_decimals) / (4 * coin_weight))_) * 0.1 + _((1048576 * 0.000000006288) / (4 * coin_weight))_ - Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), valaccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.KYVECoin(125_973_187), i.ACoin(99_143), i.BCoin(116_661_015_771_428_571), i.CCoin(100_765)).String())) + Expect(s.App().StakersKeeper.GetOutstandingCommissionRewards(s.Ctx(), poolAccountUploader.Staker).String()).To(Equal(sdk.NewCoins(i.KYVECoin(125_973_187), i.ACoin(99_143), i.BCoin(116_661_015_771_428_571), i.CCoin(100_765)).String())) // assert uploader self delegation rewards (here we round up since the result of delegation rewards is the remainder minus the truncated commission rewards) // (amount_per_bundle - (amount_per_bundle * 0.01) - _((29970208 * 0.000000006288 * 1**coin_decimals) / (4 * coin_weight))_) * (1 - 0.1) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_0, i.STAKER_0).String()).To(Equal(sdk.NewCoins(i.KYVECoin(864_026_813), i.ACoin(890_857), i.BCoin(873_338_984_228_571_429), i.CCoin(889_235)).String())) diff --git a/x/bundles/keeper/keeper_suite_zero_delegation_test.go b/x/bundles/keeper/keeper_suite_zero_delegation_test.go index a466e400..417720fa 100644 --- a/x/bundles/keeper/keeper_suite_zero_delegation_test.go +++ b/x/bundles/keeper/keeper_suite_zero_delegation_test.go @@ -27,7 +27,7 @@ TEST CASES - zero delegation var _ = Describe("zero delegation", Ordered, func() { var s *i.KeeperTestSuite - var initialBalanceStaker0, initialBalanceValaddress0, initialBalanceStaker1, initialBalanceValaddress1 uint64 + var initialBalanceStaker0, initialBalancePoolAddress0, initialBalanceStaker1, initialBalancePoolAddress1 uint64 amountPerBundle := uint64(10_000) @@ -36,10 +36,10 @@ var _ = Describe("zero delegation", Ordered, func() { s = i.NewCleanChain() initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) // create clean pool for every test case gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() @@ -93,7 +93,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -103,13 +103,13 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -117,7 +117,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -131,7 +131,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -144,14 +144,14 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -167,7 +167,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -194,7 +194,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -204,13 +204,13 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -218,7 +218,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -237,14 +237,14 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -252,7 +252,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -268,7 +268,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -302,7 +302,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -313,7 +313,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -324,7 +324,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -337,7 +337,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -351,7 +351,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -359,7 +359,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -369,14 +369,14 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -434,22 +434,22 @@ var _ = Describe("zero delegation", Ordered, func() { Expect(bundleProposal.VotersAbstain).To(BeEmpty()) // check uploader status - valaccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccountUploader.Points).To(BeZero()) + poolAccountUploader, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccountUploader.Points).To(BeZero()) - balanceUploaderValaddress := s.GetBalanceFromAddress(valaccountUploader.PoolAddress) - Expect(balanceUploaderValaddress).To(Equal(initialBalanceValaddress0)) + balanceUploaderValaddress := s.GetBalanceFromAddress(poolAccountUploader.PoolAddress) + Expect(balanceUploaderValaddress).To(Equal(initialBalancePoolAddress0)) - balanceUploader := s.GetBalanceFromAddress(valaccountUploader.Staker) + balanceUploader := s.GetBalanceFromAddress(poolAccountUploader.Staker) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) // calculate uploader rewards @@ -480,7 +480,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -491,7 +491,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -502,7 +502,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -515,7 +515,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -529,7 +529,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -537,7 +537,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -547,14 +547,14 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) initialBalanceStaker1 = s.GetBalanceFromAddress(i.STAKER_1) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_1_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_1_A) // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -604,8 +604,8 @@ var _ = Describe("zero delegation", Ordered, func() { _, uploaderActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(uploaderActive).To(BeFalse()) - balanceValaddress := s.GetBalanceFromAddress(i.VALADDRESS_0_A) - Expect(balanceValaddress).To(Equal(initialBalanceValaddress0)) + balancePoolAddress := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + Expect(balancePoolAddress).To(Equal(initialBalancePoolAddress0)) balanceUploader := s.GetBalanceFromAddress(i.STAKER_0) _, uploaderFound := s.App().StakersKeeper.GetValidator(s.Ctx(), i.STAKER_0) @@ -622,13 +622,13 @@ var _ = Describe("zero delegation", Ordered, func() { Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(200*i.KYVE - slashAmount)) // check voter status - valaccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountVoter.Points).To(BeZero()) + poolAccountVoter, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountVoter.Points).To(BeZero()) - balanceVoterValaddress := s.GetBalanceFromAddress(valaccountVoter.PoolAddress) - Expect(balanceVoterValaddress).To(Equal(initialBalanceValaddress1)) + balanceVoterPoolAddress := s.GetBalanceFromAddress(poolAccountVoter.PoolAddress) + Expect(balanceVoterPoolAddress).To(Equal(initialBalancePoolAddress1)) - balanceVoter := s.GetBalanceFromAddress(valaccountVoter.Staker) + balanceVoter := s.GetBalanceFromAddress(poolAccountVoter.Staker) Expect(balanceVoter).To(Equal(initialBalanceStaker1)) Expect(s.App().StakersKeeper.GetOutstandingRewards(s.Ctx(), i.STAKER_1, i.STAKER_1)).To(BeEmpty()) @@ -648,7 +648,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -659,7 +659,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -670,7 +670,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -683,7 +683,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -697,7 +697,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -716,7 +716,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -730,7 +730,7 @@ var _ = Describe("zero delegation", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -749,8 +749,8 @@ var _ = Describe("zero delegation", Ordered, func() { _, stakerFound := s.App().StakersKeeper.GetValidator(s.Ctx(), i.STAKER_1) Expect(stakerFound).To(BeTrue()) - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_1, 0) + Expect(poolAccountActive).To(BeFalse()) // check if voter got slashed slashAmountRatio := s.App().DelegationKeeper.GetTimeoutSlash(s.Ctx()) @@ -766,7 +766,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -776,7 +776,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -789,7 +789,7 @@ var _ = Describe("zero delegation", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesError(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", diff --git a/x/bundles/keeper/logic_bundles_test.go b/x/bundles/keeper/logic_bundles_test.go index c333dfc9..9fa3dca1 100644 --- a/x/bundles/keeper/logic_bundles_test.go +++ b/x/bundles/keeper/logic_bundles_test.go @@ -105,7 +105,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -116,7 +116,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -136,7 +136,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -147,7 +147,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -172,7 +172,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -183,7 +183,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -221,7 +221,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -232,7 +232,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -270,7 +270,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -281,7 +281,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -292,7 +292,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -332,7 +332,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -343,7 +343,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -354,7 +354,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -394,7 +394,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -414,7 +414,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -425,7 +425,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -463,7 +463,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -474,7 +474,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -510,7 +510,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -521,14 +521,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -536,7 +536,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -554,7 +554,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.CreateValidator(i.STAKER_2, "Staker-2", int64(100*i.KYVE)) // ACT - err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_2, i.VALADDRESS_2_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") + err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_2, i.POOL_ADDRESS_2_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") // ASSERT Expect(err).To(Equal(stakertypes.ErrPoolAccountUnauthorized)) @@ -567,7 +567,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -578,14 +578,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -593,7 +593,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -611,7 +611,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.CommitAfterSeconds(1) // ACT - err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.VALADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") + err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.POOL_ADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") // ASSERT Expect(err).To(Equal(bundlesTypes.ErrBundleDropped)) @@ -624,7 +624,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -635,14 +635,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -651,7 +651,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "another_storage_id", @@ -667,7 +667,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.Commit() // ACT - err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.VALADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") + err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.POOL_ADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") // ASSERT Expect(err).To(Equal(bundlesTypes.ErrInvalidStorageId)) @@ -680,7 +680,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -691,14 +691,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -707,7 +707,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -724,7 +724,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -732,7 +732,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { }) // ACT - err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.VALADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") + err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.POOL_ADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") // ASSERT Expect(err).To(Equal(bundlesTypes.ErrAlreadyVotedValid)) @@ -745,7 +745,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -756,14 +756,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -772,7 +772,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -789,7 +789,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -797,7 +797,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { }) // ACT - err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.VALADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") + err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.POOL_ADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") // ASSERT Expect(err).To(Equal(bundlesTypes.ErrAlreadyVotedInvalid)) @@ -810,7 +810,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -821,14 +821,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -837,7 +837,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundlesTypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -854,7 +854,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) // ACT - err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.VALADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") + err := s.App().BundlesKeeper.AssertCanVote(s.Ctx(), 0, i.STAKER_1, i.POOL_ADDRESS_1_A, "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI") // ASSERT Expect(err).NotTo(HaveOccurred()) @@ -869,7 +869,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -880,14 +880,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -896,7 +896,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) // ACT - err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_2, i.VALADDRESS_2_A, 0) + err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_2, i.POOL_ADDRESS_2_A, 0) // ASSERT Expect(err).To(Equal(stakertypes.ErrPoolAccountUnauthorized)) @@ -909,7 +909,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -920,14 +920,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -936,7 +936,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) // ACT - err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_1, i.VALADDRESS_1_A, 0) + err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_1, i.POOL_ADDRESS_1_A, 0) // ASSERT Expect(err.Error()).To(Equal(errors.Wrapf(bundlesTypes.ErrNotDesignatedUploader, "expected %v received %v", i.STAKER_0, i.STAKER_1).Error())) @@ -949,7 +949,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -960,14 +960,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -976,7 +976,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(30) // ACT - err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_0, i.VALADDRESS_0_A, 0) + err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_0, i.POOL_ADDRESS_0_A, 0) // ASSERT pool, _ := s.App().PoolKeeper.GetPool(s.Ctx(), 0) @@ -992,7 +992,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -1003,14 +1003,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -1019,7 +1019,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) // ACT - err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_0, i.VALADDRESS_0_A, 1000) + err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_0, i.POOL_ADDRESS_0_A, 1000) // ASSERT Expect(err).To(HaveOccurred()) @@ -1032,7 +1032,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -1043,14 +1043,14 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundlesTypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -1059,7 +1059,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() { s.WaitSeconds(60) // ACT - err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_0, i.VALADDRESS_0_A, 0) + err := s.App().BundlesKeeper.AssertCanPropose(s.Ctx(), 0, i.STAKER_0, i.POOL_ADDRESS_0_A, 0) // ASSERT Expect(err).NotTo(HaveOccurred()) diff --git a/x/bundles/keeper/logic_end_block_handle_upload_timeout_test.go b/x/bundles/keeper/logic_end_block_handle_upload_timeout_test.go index d8e30164..8e70d9ef 100644 --- a/x/bundles/keeper/logic_end_block_handle_upload_timeout_test.go +++ b/x/bundles/keeper/logic_end_block_handle_upload_timeout_test.go @@ -97,7 +97,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -105,7 +105,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -118,7 +118,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Next uploader can stay although pool ran out of funds", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -173,7 +173,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Next uploader gets removed due to pool upgrading", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -212,7 +212,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Next uploader gets removed due to pool being disabled", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -244,7 +244,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Next uploader gets removed due to pool not reaching min delegation", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -284,7 +284,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Next uploader gets removed due to pool having validators with too much voting power", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -314,7 +314,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Staker is next uploader of genesis bundle and upload interval and timeout does not pass", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -342,7 +342,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Staker is next uploader of genesis bundle and upload timeout does not pass but upload interval passes", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -371,7 +371,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Staker is next uploader of genesis bundle and upload timeout does pass together with upload interval", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -407,7 +407,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Staker is next uploader of bundle proposal and upload interval does not pass", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -415,7 +415,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -429,7 +429,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -459,7 +459,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Staker is next uploader of bundle proposal and upload timeout does not pass", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -467,7 +467,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -481,7 +481,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -512,7 +512,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Staker is next uploader of bundle proposal and upload timeout passes with the previous bundle being valid", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -520,7 +520,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -534,7 +534,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -580,7 +580,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("Staker is next uploader of bundle proposal and upload timeout passes with the previous bundle not reaching quorum", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -588,7 +588,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -650,13 +650,13 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -664,7 +664,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -678,7 +678,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -686,7 +686,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -747,13 +747,13 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -761,7 +761,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -775,7 +775,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -793,7 +793,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -807,7 +807,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -871,7 +871,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("A bundle proposal with no quorum does not reach the upload interval", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -879,7 +879,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -915,7 +915,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { It("A bundle proposal with no quorum does reach the upload interval", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -923,7 +923,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -977,13 +977,13 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -991,7 +991,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1043,13 +1043,13 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -1057,7 +1057,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1071,7 +1071,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1079,7 +1079,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1131,13 +1131,13 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -1145,7 +1145,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1159,7 +1159,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1167,7 +1167,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1239,7 +1239,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -1247,7 +1247,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 1, - PoolAddress: i.VALADDRESS_1_B, + PoolAddress: i.POOL_ADDRESS_1_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -1261,13 +1261,13 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 1, - PoolAddress: i.VALADDRESS_2_B, + PoolAddress: i.POOL_ADDRESS_2_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_1_B, + Creator: i.POOL_ADDRESS_1_B, Staker: i.STAKER_1, PoolId: 1, }) @@ -1275,7 +1275,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_B, + Creator: i.POOL_ADDRESS_1_B, Staker: i.STAKER_1, PoolId: 1, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1289,7 +1289,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_0_B, + Creator: i.POOL_ADDRESS_0_B, Staker: i.STAKER_0, PoolId: 1, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -1307,7 +1307,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { s.App().BundlesKeeper.SetBundleProposal(s.Ctx(), bundleProposal) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_B, + Creator: i.POOL_ADDRESS_1_B, Staker: i.STAKER_1, PoolId: 1, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1321,7 +1321,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_0_B, + Creator: i.POOL_ADDRESS_0_B, Staker: i.STAKER_0, PoolId: 1, StorageId: "P9edn0bjEfMU_lecFDIPLvGO2v2ltpFNUMWp5kgPddg", @@ -1357,8 +1357,8 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() { Expect(poolStakers).To(HaveLen(2)) // check if next uploader received a point - _, valaccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 1) - Expect(valaccountActive).To(BeFalse()) + _, poolAccountActive := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_2, 1) + Expect(poolAccountActive).To(BeFalse()) _, found = s.App().StakersKeeper.GetValidator(s.Ctx(), i.STAKER_2) Expect(found).To(BeTrue()) diff --git a/x/bundles/keeper/msg_server_claim_uploader_role_test.go b/x/bundles/keeper/msg_server_claim_uploader_role_test.go index 9123e436..3cc05aff 100644 --- a/x/bundles/keeper/msg_server_claim_uploader_role_test.go +++ b/x/bundles/keeper/msg_server_claim_uploader_role_test.go @@ -63,7 +63,7 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -73,7 +73,7 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -88,7 +88,7 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -109,7 +109,7 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, }) @@ -130,7 +130,7 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -166,7 +166,7 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -206,14 +206,14 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ACT s.RunTxBundlesError(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_B, + Creator: i.POOL_ADDRESS_0_B, Staker: i.STAKER_0, PoolId: 0, }) @@ -233,14 +233,14 @@ var _ = Describe("msg_server_claim_uploader_role.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) // ACT s.RunTxBundlesError(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, }) diff --git a/x/bundles/keeper/msg_server_skip_uploader_role_test.go b/x/bundles/keeper/msg_server_skip_uploader_role_test.go index 6fbce8d6..9d7ed2c3 100644 --- a/x/bundles/keeper/msg_server_skip_uploader_role_test.go +++ b/x/bundles/keeper/msg_server_skip_uploader_role_test.go @@ -67,7 +67,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -77,13 +77,13 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -93,7 +93,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -102,7 +102,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -123,7 +123,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { It("Skip uploader role on data bundle if staker is next uploader", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -131,7 +131,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -143,7 +143,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSkipUploaderRole{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, FromIndex: 100, @@ -185,7 +185,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { It("Skip uploader on data bundle after uploader role has already been skipped", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -193,7 +193,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -204,7 +204,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { s.WaitSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSkipUploaderRole{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, FromIndex: 100, @@ -215,7 +215,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSkipUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, FromIndex: 100, @@ -265,7 +265,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSkipUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, FromIndex: 0, @@ -311,7 +311,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { It("Skip uploader role on data bundle with current round containing a valid bundle", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -319,7 +319,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -331,7 +331,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSkipUploaderRole{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, FromIndex: 100, @@ -373,7 +373,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { It("Skip uploader role on data bundle with current round containing an invalid bundle", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -381,7 +381,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -393,7 +393,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSkipUploaderRole{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, FromIndex: 100, diff --git a/x/bundles/keeper/msg_server_submit_bundle_proposal_test.go b/x/bundles/keeper/msg_server_submit_bundle_proposal_test.go index b3da62bd..b7a04f32 100644 --- a/x/bundles/keeper/msg_server_submit_bundle_proposal_test.go +++ b/x/bundles/keeper/msg_server_submit_bundle_proposal_test.go @@ -73,7 +73,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -83,13 +83,13 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -105,7 +105,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "", @@ -131,7 +131,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -157,7 +157,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -183,7 +183,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -209,7 +209,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -235,7 +235,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -261,7 +261,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -300,7 +300,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -339,7 +339,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -378,7 +378,7 @@ var _ = Describe("msg_server_submit_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", diff --git a/x/bundles/keeper/msg_server_vote_bundle_proposal_test.go b/x/bundles/keeper/msg_server_vote_bundle_proposal_test.go index ac443b9b..1379a43e 100644 --- a/x/bundles/keeper/msg_server_vote_bundle_proposal_test.go +++ b/x/bundles/keeper/msg_server_vote_bundle_proposal_test.go @@ -71,7 +71,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -81,19 +81,19 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -114,7 +114,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { It("Try to vote abstain on proposal again", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -123,7 +123,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesError(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -141,7 +141,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { It("Try to vote valid on proposal after abstain vote", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -150,7 +150,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -168,7 +168,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { It("Try to vote invalid on proposal after abstain vote", func() { // ARRANGE s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -177,7 +177,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -195,7 +195,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { It("Try to vote unspecified on proposal", func() { // ACT s.RunTxBundlesError(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -222,13 +222,13 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", @@ -237,7 +237,7 @@ var _ = Describe("msg_server_vote_bundle_proposal.go", Ordered, func() { // ACT s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_2_A, + Creator: i.POOL_ADDRESS_2_A, Staker: i.STAKER_2, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", diff --git a/x/delegation/keeper/msg_server_redelegate_test.go b/x/delegation/keeper/msg_server_redelegate_test.go index 76a1e562..b640e7d4 100644 --- a/x/delegation/keeper/msg_server_redelegate_test.go +++ b/x/delegation/keeper/msg_server_redelegate_test.go @@ -73,7 +73,7 @@ var _ = Describe("Delegation - Redelegation", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.BOB, PoolId: 1, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), diff --git a/x/delegation/keeper/msg_server_undelegate_test.go b/x/delegation/keeper/msg_server_undelegate_test.go index 02c99b56..d1dc60a6 100644 --- a/x/delegation/keeper/msg_server_undelegate_test.go +++ b/x/delegation/keeper/msg_server_undelegate_test.go @@ -79,7 +79,7 @@ var _ = Describe("msg_server_undelegate.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.BOB, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), diff --git a/x/pool/keeper/msg_server_disable_pool_test.go b/x/pool/keeper/msg_server_disable_pool_test.go index 7f00f274..f0c94365 100644 --- a/x/pool/keeper/msg_server_disable_pool_test.go +++ b/x/pool/keeper/msg_server_disable_pool_test.go @@ -370,7 +370,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -381,7 +381,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -436,7 +436,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -445,7 +445,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -456,7 +456,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -511,7 +511,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -522,14 +522,14 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -537,7 +537,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI", diff --git a/x/query/keeper/grpc_account_redelegation_test.go b/x/query/keeper/grpc_account_redelegation_test.go index cdab5baf..838a6865 100644 --- a/x/query/keeper/grpc_account_redelegation_test.go +++ b/x/query/keeper/grpc_account_redelegation_test.go @@ -53,7 +53,7 @@ var _ = Describe("grpc_account_redelegation.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), diff --git a/x/query/keeper/grpc_query_can_propose_test.go b/x/query/keeper/grpc_query_can_propose_test.go index 3e065797..5bd521ab 100644 --- a/x/query/keeper/grpc_query_can_propose_test.go +++ b/x/query/keeper/grpc_query_can_propose_test.go @@ -70,7 +70,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -81,14 +81,14 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -96,7 +96,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "test_storage_id", @@ -110,7 +110,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { }) s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -129,7 +129,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 1, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -140,7 +140,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(Equal(errors.Wrapf(errorsTypes.ErrNotFound, pooltypes.ErrPoolNotFound.Error(), 1).Error())) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 1, StorageId: "test_storage_id", @@ -173,7 +173,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -184,7 +184,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(Equal(bundletypes.ErrPoolCurrentlyUpgrading.Error())) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -212,7 +212,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -223,7 +223,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(Equal(bundletypes.ErrPoolDisabled.Error())) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -252,7 +252,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -263,7 +263,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(Equal(bundletypes.ErrMinDelegationNotReached.Error())) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -285,7 +285,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_0, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -296,7 +296,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(Equal(stakertypes.ErrPoolAccountUnauthorized.Error())) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "test_storage_id", @@ -325,14 +325,14 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err = s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) } else { canPropose, err = s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_0, - Proposer: i.VALADDRESS_0_A, + Proposer: i.POOL_ADDRESS_0_A, FromIndex: 100, }) } @@ -352,7 +352,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { if bundleProposal.NextUploader == i.STAKER_0 { _, txErr = s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -366,7 +366,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { }) } else { _, txErr = s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "test_storage_id", @@ -396,7 +396,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -409,7 +409,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(Equal(errors.Wrapf(bundletypes.ErrUploadInterval, "expected %v < %v", s.Ctx().BlockTime().Unix(), bundleProposal.UpdatedAt+pool.UploadInterval).Error())) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -431,14 +431,14 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose_1, err_1 := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 99, }) canPropose_2, err_2 := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 101, }) @@ -456,7 +456,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose_2.Reason).To(Equal(errors.Wrapf(bundletypes.ErrFromIndex, "expected %v received %v", pool.CurrentIndex+bundleProposal.BundleSize, 101).Error())) _, txErr_1 := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -473,7 +473,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(txErr_1.Error()).To(Equal(canPropose_1.Reason)) _, txErr_2 := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -495,7 +495,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -506,7 +506,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(BeEmpty()) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -534,7 +534,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { canPropose, err := s.App().QueryKeeper.CanPropose(s.Ctx(), &querytypes.QueryCanProposeRequest{ PoolId: 0, Staker: i.STAKER_1, - Proposer: i.VALADDRESS_1_A, + Proposer: i.POOL_ADDRESS_1_A, FromIndex: 100, }) @@ -545,7 +545,7 @@ var _ = Describe("grpc_query_can_propose.go", Ordered, func() { Expect(canPropose.Reason).To(BeEmpty()) _, txErr := s.RunTx(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", diff --git a/x/query/keeper/grpc_query_can_validate_test.go b/x/query/keeper/grpc_query_can_validate_test.go index a179c60f..69dc544f 100644 --- a/x/query/keeper/grpc_query_can_validate_test.go +++ b/x/query/keeper/grpc_query_can_validate_test.go @@ -47,7 +47,7 @@ var _ = Describe("grpc_query_can_validate.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -58,7 +58,7 @@ var _ = Describe("grpc_query_can_validate.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 1, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -73,7 +73,7 @@ var _ = Describe("grpc_query_can_validate.go", Ordered, func() { // ACT canValidate, err := s.App().QueryKeeper.CanValidate(s.Ctx(), &querytypes.QueryCanValidateRequest{ PoolId: 2, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, }) // ASSERT @@ -87,7 +87,7 @@ var _ = Describe("grpc_query_can_validate.go", Ordered, func() { // ACT canValidate, err := s.App().QueryKeeper.CanValidate(s.Ctx(), &querytypes.QueryCanValidateRequest{ PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, }) // ASSERT @@ -101,7 +101,7 @@ var _ = Describe("grpc_query_can_validate.go", Ordered, func() { // ACT canValidate, err := s.App().QueryKeeper.CanValidate(s.Ctx(), &querytypes.QueryCanValidateRequest{ PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, }) // ASSERT @@ -115,7 +115,7 @@ var _ = Describe("grpc_query_can_validate.go", Ordered, func() { // ACT canValidate, err := s.App().QueryKeeper.CanValidate(s.Ctx(), &querytypes.QueryCanValidateRequest{ PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, }) // ASSERT diff --git a/x/query/keeper/grpc_query_can_vote_test.go b/x/query/keeper/grpc_query_can_vote_test.go index dc8dd2ab..5f88eaa6 100644 --- a/x/query/keeper/grpc_query_can_vote_test.go +++ b/x/query/keeper/grpc_query_can_vote_test.go @@ -71,7 +71,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -82,14 +82,14 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { s.RunTxStakersSuccess(&stakertypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) s.RunTxBundlesSuccess(&bundletypes.MsgClaimUploaderRole{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, }) @@ -97,7 +97,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { s.CommitAfterSeconds(60) s.RunTxBundlesSuccess(&bundletypes.MsgSubmitBundleProposal{ - Creator: i.VALADDRESS_0_A, + Creator: i.POOL_ADDRESS_0_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "test_storage_id", @@ -119,7 +119,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 1, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -130,7 +130,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(errors.Wrapf(errorsTypes.ErrNotFound, pooltypes.ErrPoolNotFound.Error(), 1).Error())) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 1, StorageId: "test_storage_id", @@ -157,7 +157,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -168,7 +168,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(bundletypes.ErrPoolCurrentlyUpgrading.Error())) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -190,7 +190,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -201,7 +201,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(bundletypes.ErrPoolDisabled.Error())) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -224,7 +224,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -235,7 +235,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(bundletypes.ErrMinDelegationNotReached.Error())) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -251,7 +251,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_0, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -262,7 +262,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(stakertypes.ErrPoolAccountUnauthorized.Error())) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_0, PoolId: 0, StorageId: "test_storage_id", @@ -283,7 +283,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -294,7 +294,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(bundletypes.ErrBundleDropped.Error())) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -310,7 +310,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "another_test_storage_id", }) @@ -321,7 +321,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(bundletypes.ErrInvalidStorageId.Error())) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "another_test_storage_id", @@ -335,7 +335,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { It("Call can vote if voter has already voted valid", func() { // ARRANGE _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -348,7 +348,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -359,7 +359,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(bundletypes.ErrAlreadyVotedValid.Error())) _, txErr = s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -373,7 +373,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { It("Call can vote if voter has already voted invalid", func() { // ARRANGE _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -386,7 +386,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -397,7 +397,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal(bundletypes.ErrAlreadyVotedInvalid.Error())) _, txErr = s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -411,7 +411,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { It("Call can vote if voter has already voted abstain", func() { // ARRANGE _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -424,7 +424,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -435,7 +435,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(Equal("KYVE_VOTE_NO_ABSTAIN_ALLOWED")) _, txErr = s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -450,7 +450,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -461,7 +461,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(BeEmpty()) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", @@ -483,7 +483,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { canVote, err := s.App().QueryKeeper.CanVote(s.Ctx(), &querytypes.QueryCanVoteRequest{ PoolId: 0, Staker: i.STAKER_1, - Voter: i.VALADDRESS_1_A, + Voter: i.POOL_ADDRESS_1_A, StorageId: "test_storage_id", }) @@ -494,7 +494,7 @@ var _ = Describe("grpc_query_can_vote.go", Ordered, func() { Expect(canVote.Reason).To(BeEmpty()) _, txErr := s.RunTx(&bundletypes.MsgVoteBundleProposal{ - Creator: i.VALADDRESS_1_A, + Creator: i.POOL_ADDRESS_1_A, Staker: i.STAKER_1, PoolId: 0, StorageId: "test_storage_id", diff --git a/x/query/keeper/helper.go b/x/query/keeper/helper.go index e24f3ef6..a52e3620 100644 --- a/x/query/keeper/helper.go +++ b/x/query/keeper/helper.go @@ -16,8 +16,8 @@ func (k Keeper) GetFullStaker(ctx sdk.Context, stakerAddress string) *types.Full for _, poolAccount := range k.stakerKeeper.GetPoolAccountsFromStaker(ctx, stakerAddress) { pool, _ := k.poolKeeper.GetPool(ctx, poolAccount.PoolId) - accountValaddress, _ := sdk.AccAddressFromBech32(poolAccount.PoolAddress) - balanceValaccount := k.bankKeeper.GetBalance(ctx, accountValaddress, globalTypes.Denom).Amount.Uint64() + poolAddressAccount, _ := sdk.AccAddressFromBech32(poolAccount.PoolAddress) + balancePoolAddress := k.bankKeeper.GetBalance(ctx, poolAddressAccount, globalTypes.Denom).Amount.Uint64() commissionChange, found := k.stakerKeeper.GetCommissionChangeEntryByIndex2(ctx, stakerAddress, poolAccount.PoolId) var commissionChangeEntry *types.CommissionChangeEntry = nil @@ -56,7 +56,7 @@ func (k Keeper) GetFullStaker(ctx sdk.Context, stakerAddress string) *types.Full Points: poolAccount.Points, IsLeaving: poolAccount.IsLeaving, PoolAddress: poolAccount.PoolAddress, - Balance: balanceValaccount, + Balance: balancePoolAddress, Commission: poolAccount.Commission, PendingCommissionChange: commissionChangeEntry, StakeFraction: poolAccount.StakeFraction, diff --git a/x/stakers/keeper/keeper_suite_effective_stake_test.go b/x/stakers/keeper/keeper_suite_effective_stake_test.go index c6169526..12ed0d0a 100644 --- a/x/stakers/keeper/keeper_suite_effective_stake_test.go +++ b/x/stakers/keeper/keeper_suite_effective_stake_test.go @@ -63,7 +63,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -73,7 +73,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -83,7 +83,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -107,7 +107,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -117,7 +117,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -127,7 +127,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -151,7 +151,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -161,7 +161,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -171,7 +171,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -195,7 +195,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -205,7 +205,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -215,7 +215,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -233,7 +233,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -243,7 +243,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -253,7 +253,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -275,7 +275,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -285,7 +285,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -295,7 +295,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -315,7 +315,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -325,7 +325,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -335,7 +335,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -355,7 +355,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -375,7 +375,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -385,7 +385,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.5"), @@ -395,7 +395,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.2"), @@ -419,7 +419,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.5"), @@ -429,7 +429,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.9"), @@ -439,7 +439,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.2"), @@ -463,7 +463,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.8"), @@ -473,7 +473,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.7"), @@ -483,7 +483,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.2"), @@ -505,7 +505,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -515,7 +515,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0"), @@ -525,7 +525,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.5"), @@ -547,7 +547,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0"), @@ -557,7 +557,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0"), @@ -567,7 +567,7 @@ var _ = Describe("keeper_suite_effective_stake_test.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_2, PoolId: 0, - PoolAddress: i.VALADDRESS_2_A, + PoolAddress: i.POOL_ADDRESS_2_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0"), diff --git a/x/stakers/keeper/msg_server_join_pool_test.go b/x/stakers/keeper/msg_server_join_pool_test.go index d7273a27..a5ff6007 100644 --- a/x/stakers/keeper/msg_server_join_pool_test.go +++ b/x/stakers/keeper/msg_server_join_pool_test.go @@ -52,8 +52,8 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s := i.NewCleanChain() initialBalanceStaker0 := uint64(0) - initialBalanceValaddress0 := uint64(0) - initialBalanceValaddress1 := uint64(0) + initialBalancePoolAddress0 := uint64(0) + initialBalancePoolAddress1 := uint64(0) gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() @@ -76,8 +76,8 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.CreateValidator(i.STAKER_0, "Staker-0", int64(100*i.KYVE)) initialBalanceStaker0 = s.GetBalanceFromAddress(i.STAKER_0) - initialBalanceValaddress0 = s.GetBalanceFromAddress(i.VALADDRESS_0_A) - initialBalanceValaddress1 = s.GetBalanceFromAddress(i.VALADDRESS_0_B) + initialBalancePoolAddress0 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + initialBalancePoolAddress1 = s.GetBalanceFromAddress(i.POOL_ADDRESS_0_B) }) AfterEach(func() { @@ -86,8 +86,8 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { It("Test if a newly created staker is participating in no pools yet", func() { // ASSERT - valaccounts := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccounts).To(HaveLen(0)) + poolAccounts := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccounts).To(HaveLen(0)) }) It("Join the first pool as the first staker to a newly created pool", func() { @@ -95,7 +95,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -103,14 +103,14 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { // ASSERT balanceAfterStaker0 := s.GetBalanceFromAddress(i.STAKER_0) - balanceAfterValaddress0 := s.GetBalanceFromAddress(i.VALADDRESS_0_A) + balanceAfterPoolAddress0 := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) Expect(initialBalanceStaker0 - balanceAfterStaker0).To(Equal(100 * i.KYVE)) - Expect(balanceAfterValaddress0 - initialBalanceValaddress0).To(Equal(100 * i.KYVE)) + Expect(balanceAfterPoolAddress0 - initialBalancePoolAddress0).To(Equal(100 * i.KYVE)) - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -118,13 +118,13 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(BeZero()) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_0_A)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_0_A)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeFalse()) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) @@ -153,7 +153,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { _, err := s.RunTx(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -163,22 +163,22 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { // ASSERT balanceAfterStaker0 := s.GetBalanceFromAddress(i.STAKER_0) - balanceAfterValaddress0 := s.GetBalanceFromAddress(i.VALADDRESS_0_A) + balanceAfterPoolAddress0 := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) Expect(initialBalanceStaker0 - balanceAfterStaker0).To(Equal(0 * i.KYVE)) - Expect(balanceAfterValaddress0 - initialBalanceValaddress0).To(Equal(0 * i.KYVE)) + Expect(balanceAfterPoolAddress0 - initialBalancePoolAddress0).To(Equal(0 * i.KYVE)) - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(0)) + Expect(poolAccountsOfStaker).To(HaveLen(0)) _, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) Expect(active).To(BeFalse()) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 1) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 1) - Expect(valaccountsOfPool).To(HaveLen(0)) + Expect(poolAccountsOfPool).To(HaveLen(0)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 1) @@ -195,7 +195,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -205,7 +205,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 0 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -213,14 +213,14 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { // ASSERT balanceAfterStaker0 := s.GetBalanceFromAddress(i.STAKER_0) - balanceAfterValaddress0 := s.GetBalanceFromAddress(i.VALADDRESS_0_A) + balanceAfterPoolAddress0 := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) Expect(initialBalanceStaker0 - balanceAfterStaker0).To(BeZero()) - Expect(balanceAfterValaddress0 - initialBalanceValaddress0).To(BeZero()) + Expect(balanceAfterPoolAddress0 - initialBalancePoolAddress0).To(BeZero()) - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -228,13 +228,13 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(BeZero()) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_0_A)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_0_A)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeFalse()) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(2)) + Expect(poolAccountsOfPool).To(HaveLen(2)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) @@ -248,7 +248,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -265,9 +265,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { )) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -275,13 +275,13 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(BeZero()) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_0_A)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_0_A)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeFalse()) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool = s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) @@ -296,7 +296,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -306,16 +306,16 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) }) It("join a pool with the same pool address as the staker address", func() { @@ -330,9 +330,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Try to join the same pool with a different pool address", func() { @@ -340,7 +340,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -350,16 +350,16 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) }) It("Try to join another pool with the same pool address again", func() { @@ -367,7 +367,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -386,15 +386,15 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(HaveLen(1)) }) It("Try to join pool with a pool address that is already used by another staker", func() { @@ -413,7 +413,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 1, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -423,15 +423,15 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(HaveLen(1)) }) It("Try to join pool with a pool address that is already used by another staker", func() { @@ -439,7 +439,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -451,15 +451,15 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_1) - Expect(valaccountsOfStaker).To(BeEmpty()) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_1) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Try to join another pool with a different pool address", func() { @@ -467,7 +467,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -486,14 +486,14 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(2)) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(HaveLen(2)) }) It("Try to join pool with empty pool address", func() { @@ -508,8 +508,8 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Try to join pool with empty commission", func() { @@ -517,14 +517,14 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, StakeFraction: math.LegacyMustNewDecFromStr("1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Try to join pool with empty stake fraction", func() { @@ -532,14 +532,14 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Join a pool with a pool address which does not exist on chain yet", func() { @@ -560,9 +560,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(initialBalanceStaker0 - balanceAfterStaker0).To(Equal(100 * i.KYVE)) Expect(balanceAfterUnknown).To(Equal(100 * i.KYVE)) - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -574,9 +574,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeFalse()) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) Expect(totalStakeOfPool).To(Equal(100 * i.KYVE)) @@ -603,9 +603,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(initialBalanceStaker0 - balanceAfterStaker0).To(BeZero()) Expect(balanceAfterUnknown).To(BeZero()) - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -617,9 +617,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeFalse()) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) Expect(totalStakeOfPool).To(Equal(100 * i.KYVE)) @@ -640,9 +640,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Join a pool and fund the pool address with more KYVE than available in balance", func() { @@ -657,9 +657,9 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.ALICE) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.ALICE) - Expect(valaccountsOfStaker).To(BeEmpty()) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Kick out lowest staker by joining a full pool", func() { @@ -669,7 +669,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 1, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -696,7 +696,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 1, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -714,7 +714,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 1, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -741,7 +741,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 1, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -760,7 +760,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 1 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -793,7 +793,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 1, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -812,7 +812,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 1, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -839,7 +839,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 1, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -858,7 +858,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 1 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -891,7 +891,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersError(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 0, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -908,7 +908,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -930,7 +930,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 50 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.2"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -938,14 +938,14 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { // ASSERT balanceAfterStaker0 := s.GetBalanceFromAddress(i.STAKER_0) - balanceAfterValaddress0 := s.GetBalanceFromAddress(i.VALADDRESS_0_A) + balanceAfterPoolAddress0 := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) Expect(initialBalanceStaker0 - balanceAfterStaker0).To(Equal(150 * i.KYVE)) - Expect(balanceAfterValaddress0 - initialBalanceValaddress0).To(Equal(150 * i.KYVE)) + Expect(balanceAfterPoolAddress0 - initialBalancePoolAddress0).To(Equal(150 * i.KYVE)) - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -953,15 +953,15 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(BeZero()) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_0_A)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_0_A)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeFalse()) Expect(poolAccount.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.2"))) Expect(poolAccount.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("1"))) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) @@ -976,7 +976,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -998,7 +998,7 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Amount: 50 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.2"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -1006,16 +1006,16 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { // ASSERT balanceAfterStaker0 := s.GetBalanceFromAddress(i.STAKER_0) - balanceAfterValaddress0 := s.GetBalanceFromAddress(i.VALADDRESS_0_A) - balanceAfterValaddress1 := s.GetBalanceFromAddress(i.VALADDRESS_0_B) + balanceAfterPoolAddress0 := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_A) + balanceAfterPoolAddress1 := s.GetBalanceFromAddress(i.POOL_ADDRESS_0_B) Expect(initialBalanceStaker0 - balanceAfterStaker0).To(Equal(150 * i.KYVE)) - Expect(balanceAfterValaddress0 - initialBalanceValaddress0).To(Equal(100 * i.KYVE)) - Expect(balanceAfterValaddress1 - initialBalanceValaddress1).To(Equal(50 * i.KYVE)) + Expect(balanceAfterPoolAddress0 - initialBalancePoolAddress0).To(Equal(100 * i.KYVE)) + Expect(balanceAfterPoolAddress1 - initialBalancePoolAddress1).To(Equal(50 * i.KYVE)) - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -1023,15 +1023,15 @@ var _ = Describe("msg_server_join_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(BeZero()) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_0_B)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_0_B)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeFalse()) Expect(poolAccount.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.2"))) Expect(poolAccount.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("1"))) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) diff --git a/x/stakers/keeper/msg_server_leave_pool_test.go b/x/stakers/keeper/msg_server_leave_pool_test.go index 266d4305..d2157822 100644 --- a/x/stakers/keeper/msg_server_leave_pool_test.go +++ b/x/stakers/keeper/msg_server_leave_pool_test.go @@ -49,7 +49,7 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -68,9 +68,9 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.PerformValidityChecks() // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -78,15 +78,15 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(BeZero()) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_0_A)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_0_A)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeTrue()) Expect(poolAccount.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) Expect(poolAccount.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("1"))) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) @@ -100,17 +100,17 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.CommitAfterSeconds(s.App().StakersKeeper.GetLeavePoolTime(s.Ctx())) s.CommitAfterSeconds(1) - valaccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + Expect(poolAccountsOfStaker).To(BeEmpty()) poolAccount, active = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(active).To(BeFalse()) - valaccountsOfPool = s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool = s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(BeEmpty()) + Expect(poolAccountsOfPool).To(BeEmpty()) totalStakeOfPool = s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) Expect(totalStakeOfPool).To(BeZero()) @@ -127,7 +127,7 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_1, PoolId: 0, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -141,9 +141,9 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.PerformValidityChecks() // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) @@ -151,15 +151,15 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(BeZero()) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_0_A)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_0_A)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeTrue()) Expect(poolAccount.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) Expect(poolAccount.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("1"))) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(2)) + Expect(poolAccountsOfPool).To(HaveLen(2)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) @@ -173,17 +173,17 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.CommitAfterSeconds(s.App().StakersKeeper.GetLeavePoolTime(s.Ctx())) s.CommitAfterSeconds(1) - valaccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + Expect(poolAccountsOfStaker).To(BeEmpty()) poolAccount, active = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) Expect(active).To(BeFalse()) - valaccountsOfPool = s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) + poolAccountsOfPool = s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 0) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool = s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0) Expect(totalStakeOfPool).To(Equal(100 * i.KYVE)) @@ -208,15 +208,15 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(HaveLen(1)) // wait for leave pool s.CommitAfterSeconds(s.App().StakersKeeper.GetLeavePoolTime(s.Ctx())) s.CommitAfterSeconds(1) - valaccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(BeEmpty()) + poolAccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + Expect(poolAccountsOfStaker).To(BeEmpty()) }) It("Leave one of multiple pools a staker has previously joined", func() { @@ -233,7 +233,7 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_1_A, + PoolAddress: i.POOL_ADDRESS_1_A, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), }) @@ -246,9 +246,9 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(2)) + Expect(poolAccountsOfStaker).To(HaveLen(2)) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) @@ -256,15 +256,15 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { Expect(poolAccount.Staker).To(Equal(i.STAKER_0)) Expect(poolAccount.PoolId).To(Equal(uint64(1))) - Expect(poolAccount.PoolAddress).To(Equal(i.VALADDRESS_1_A)) + Expect(poolAccount.PoolAddress).To(Equal(i.POOL_ADDRESS_1_A)) Expect(poolAccount.Points).To(BeZero()) Expect(poolAccount.IsLeaving).To(BeTrue()) Expect(poolAccount.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) Expect(poolAccount.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("1"))) - valaccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 1) + poolAccountsOfPool := s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 1) - Expect(valaccountsOfPool).To(HaveLen(1)) + Expect(poolAccountsOfPool).To(HaveLen(1)) totalStakeOfPool := s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 1) Expect(totalStakeOfPool).To(Equal(100 * i.KYVE)) @@ -276,17 +276,17 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { s.CommitAfterSeconds(s.App().StakersKeeper.GetLeavePoolTime(s.Ctx())) s.CommitAfterSeconds(1) - valaccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) + poolAccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_0) - Expect(valaccountsOfStaker).To(HaveLen(1)) + Expect(poolAccountsOfStaker).To(HaveLen(1)) poolAccount, active = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) Expect(active).To(BeFalse()) - valaccountsOfPool = s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 1) + poolAccountsOfPool = s.App().StakersKeeper.GetAllPoolAccountsOfPool(s.Ctx(), 1) - Expect(valaccountsOfPool).To(BeEmpty()) + Expect(poolAccountsOfPool).To(BeEmpty()) totalStakeOfPool = s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 1) Expect(totalStakeOfPool).To(BeZero()) @@ -307,15 +307,15 @@ var _ = Describe("msg_server_leave_pool.go", Ordered, func() { }) // ASSERT - valaccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_1) - Expect(valaccountsOfStaker).To(BeEmpty()) + poolAccountsOfStaker := s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_1) + Expect(poolAccountsOfStaker).To(BeEmpty()) // wait for leave pool s.CommitAfterSeconds(s.App().StakersKeeper.GetLeavePoolTime(s.Ctx())) s.CommitAfterSeconds(1) - valaccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_1) - Expect(valaccountsOfStaker).To(BeEmpty()) + poolAccountsOfStaker = s.App().StakersKeeper.GetPoolAccountsFromStaker(s.Ctx(), i.STAKER_1) + Expect(poolAccountsOfStaker).To(BeEmpty()) poolAccount, active := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) diff --git a/x/stakers/keeper/msg_server_update_commission_test.go b/x/stakers/keeper/msg_server_update_commission_test.go index 1a5dc66f..175b243c 100644 --- a/x/stakers/keeper/msg_server_update_commission_test.go +++ b/x/stakers/keeper/msg_server_update_commission_test.go @@ -50,7 +50,7 @@ var _ = Describe("msg_server_update_commission.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -240,7 +240,7 @@ var _ = Describe("msg_server_update_commission.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("1"), @@ -262,20 +262,20 @@ var _ = Describe("msg_server_update_commission.go", Ordered, func() { s.PerformValidityChecks() // ASSERT - valaccount0, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccount0.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) + poolAccount0, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccount0.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) - valaccount1, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) - Expect(valaccount1.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) + poolAccount1, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) + Expect(poolAccount1.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) // wait for update s.CommitAfterSeconds(s.App().StakersKeeper.GetCommissionChangeTime(s.Ctx())) s.CommitAfterSeconds(1) - valaccount0, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccount0.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) + poolAccount0, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccount0.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) - valaccount1, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) - Expect(valaccount1.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) + poolAccount1, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) + Expect(poolAccount1.Commission).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) }) }) diff --git a/x/stakers/keeper/msg_server_update_stake_fraction_test.go b/x/stakers/keeper/msg_server_update_stake_fraction_test.go index a27ba4bd..b46ab2a2 100644 --- a/x/stakers/keeper/msg_server_update_stake_fraction_test.go +++ b/x/stakers/keeper/msg_server_update_stake_fraction_test.go @@ -57,7 +57,7 @@ var _ = Describe("msg_server_update_stake_fraction.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 0, - PoolAddress: i.VALADDRESS_0_A, + PoolAddress: i.POOL_ADDRESS_0_A, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.1"), @@ -321,7 +321,7 @@ var _ = Describe("msg_server_update_stake_fraction.go", Ordered, func() { s.RunTxStakersSuccess(&stakerstypes.MsgJoinPool{ Creator: i.STAKER_0, PoolId: 1, - PoolAddress: i.VALADDRESS_0_B, + PoolAddress: i.POOL_ADDRESS_0_B, Amount: 100 * i.KYVE, Commission: math.LegacyMustNewDecFromStr("0.1"), StakeFraction: math.LegacyMustNewDecFromStr("0.1"), @@ -343,13 +343,13 @@ var _ = Describe("msg_server_update_stake_fraction.go", Ordered, func() { s.PerformValidityChecks() // ASSERT - valaccount0, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccount0.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) + poolAccount0, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccount0.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) Expect(s.App().StakersKeeper.GetValidatorPoolStake(s.Ctx(), i.STAKER_0, 0)).To(Equal(50 * i.KYVE)) Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(50 * i.KYVE)) - valaccount1, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) - Expect(valaccount1.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) + poolAccount1, _ := s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) + Expect(poolAccount1.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.1"))) Expect(s.App().StakersKeeper.GetValidatorPoolStake(s.Ctx(), i.STAKER_0, 1)).To(Equal(10 * i.KYVE)) Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 1)).To(Equal(10 * i.KYVE)) @@ -357,13 +357,13 @@ var _ = Describe("msg_server_update_stake_fraction.go", Ordered, func() { s.CommitAfterSeconds(s.App().StakersKeeper.GetCommissionChangeTime(s.Ctx())) s.CommitAfterSeconds(1) - valaccount0, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) - Expect(valaccount0.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) + poolAccount0, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 0) + Expect(poolAccount0.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.5"))) Expect(s.App().StakersKeeper.GetValidatorPoolStake(s.Ctx(), i.STAKER_0, 0)).To(Equal(50 * i.KYVE)) Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 0)).To(Equal(50 * i.KYVE)) - valaccount1, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) - Expect(valaccount1.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.03"))) + poolAccount1, _ = s.App().StakersKeeper.GetPoolAccount(s.Ctx(), i.STAKER_0, 1) + Expect(poolAccount1.StakeFraction).To(Equal(math.LegacyMustNewDecFromStr("0.03"))) Expect(s.App().StakersKeeper.GetValidatorPoolStake(s.Ctx(), i.STAKER_0, 1)).To(Equal(3 * i.KYVE)) Expect(s.App().StakersKeeper.GetTotalStakeOfPool(s.Ctx(), 1)).To(Equal(3 * i.KYVE)) }) diff --git a/x/stakers/spec/01_concepts.md b/x/stakers/spec/01_concepts.md index 0ca366df..f941205f 100644 --- a/x/stakers/spec/01_concepts.md +++ b/x/stakers/spec/01_concepts.md @@ -7,7 +7,7 @@ order: 1 The stakers module manages all properties of the stakers except their stake (this is done by the delegation module). It handles staker creation, metadata (like moniker, logo, website and commission) and the joining and leaving of -pools using valaccounts. +pools using poolAccounts. ## Code Structure @@ -26,7 +26,7 @@ metadata which can be changed at any time. Additionally, a staker can specify a commission. However, this takes `CommissionChangeTime` seconds of time before the change is applied. -## Valaccounts +## Pool Accounts To join a pool the user creates a pool account for this pool. The existence of a pool account (for a pool) means that the staker is a member of the given pool and needs to comply with the protocol diff --git a/x/stakers/spec/02_state.md b/x/stakers/spec/02_state.md index 9058e448..b8060f7c 100644 --- a/x/stakers/spec/02_state.md +++ b/x/stakers/spec/02_state.md @@ -32,11 +32,11 @@ penalty-points. - PoolAccount: `0x02 | 0x00 | PoolId | StakerAddr -> ProtocolBuffer(poolAccount)` -One additional index is maintained to query for all valaccounts of a staker. +One additional index is maintained to query for all poolAccounts of a staker. For this index only the key is used as StakerAddr and PoolId contain all information to fetch the pool account using the main key. -- ValaccountIndex2: `0x02 | 0x01 | StakerAddr | PoolId -> (empty)` +- PoolAccountIndex2: `0x02 | 0x01 | StakerAddr | PoolId -> (empty)` ```go type PoolAccount struct { diff --git a/x/stakers/spec/07_exported.md b/x/stakers/spec/07_exported.md index 17172101..0b4a1f47 100644 --- a/x/stakers/spec/07_exported.md +++ b/x/stakers/spec/07_exported.md @@ -23,11 +23,11 @@ type StakersKeeper interface { // GetCommission returns the commission of a staker as a parsed sdk.Dec GetCommission(ctx sdk.Context, stakerAddress string) sdk.Dec - // AssertValaccountAuthorized checks if the given `pool address` is allowed to vote in pool + // AssertPoolAccountAuthorized checks if the given `pool address` is allowed to vote in pool // with id `poolId` to vote in favor of `stakerAddress`. // If the pool address is not authorized the appropriate error is returned. // Otherwise, it returns `nil` - AssertValaccountAuthorized(ctx sdk.Context, poolId uint64, stakerAddress string, pool address string) error + AssertPoolAccountAuthorized(ctx sdk.Context, poolId uint64, stakerAddress string, pool address string) error // GetActiveStakers returns all staker-addresses that are // currently participating in at least one pool. @@ -56,10 +56,6 @@ type StakersKeeper interface { // Returns the amount of points the staker had before the reset. ResetPoints(ctx sdk.Context, poolId uint64, stakerAddress string) (previousPoints uint64) - // DoesValaccountExist only checks if the key is present in the KV-Store - // without loading and unmarshalling to full entry - DoesValaccountExist(ctx sdk.Context, poolId uint64, stakerAddress string) bool - DoesStakerExist(ctx sdk.Context, staker string) bool // IncreaseStakerCommissionRewards increases the commission rewards of a diff --git a/x/stakers/types/genesis.go b/x/stakers/types/genesis.go index 5b3fd1ce..e753aeb0 100644 --- a/x/stakers/types/genesis.go +++ b/x/stakers/types/genesis.go @@ -16,14 +16,14 @@ func (gs GenesisState) Validate() error { // Staker stakerLeaving := make(map[string]bool) - // Valaccounts - valaccountMap := make(map[string]struct{}) + // Pool accounts + poolAccountsMap := make(map[string]struct{}) for _, elem := range gs.PoolAccountList { index := string(PoolAccountKey(elem.PoolId, elem.Staker)) - if _, ok := valaccountMap[index]; ok { + if _, ok := poolAccountsMap[index]; ok { return fmt.Errorf("duplicated index for pool account %v", elem) } - valaccountMap[index] = struct{}{} + poolAccountsMap[index] = struct{}{} stakerLeaving[index] = elem.IsLeaving } diff --git a/x/stakers/types/genesis.pb.go b/x/stakers/types/genesis.pb.go index 4608fcd7..0aa0ff82 100644 --- a/x/stakers/types/genesis.pb.go +++ b/x/stakers/types/genesis.pb.go @@ -29,7 +29,7 @@ type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // staker_list ... StakerList []Staker `protobuf:"bytes,2,rep,name=staker_list,json=stakerList,proto3" json:"staker_list"` - // valaccount_list ... + // pool_account_list ... PoolAccountList []PoolAccount `protobuf:"bytes,3,rep,name=pool_account_list,json=poolAccountList,proto3" json:"pool_account_list"` // commission_change_entries ... CommissionChangeEntries []CommissionChangeEntry `protobuf:"bytes,4,rep,name=commission_change_entries,json=commissionChangeEntries,proto3" json:"commission_change_entries"`