From fa1e09444aae80022c7ba3ad3378e3d2f40060fb Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Fri, 2 Aug 2024 14:56:02 +0200 Subject: [PATCH 1/4] Fix use of hardcoded cosmos... address --- tests/integration/distribution.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go index 2e5f2f0bbb..384486f873 100644 --- a/tests/integration/distribution.go +++ b/tests/integration/distribution.go @@ -138,8 +138,7 @@ func (s *CCVTestSuite) TestRewardsDistribution() { consuValsRewards := consumerValsOutstandingRewardsFunc(s.providerCtx()) // increase the block height so validators are eligible for consumer rewards (see `IsEligibleForConsumerRewards`) - numberOfBlocksToStartReceivingRewards := - providerKeeper.GetNumberOfEpochsToStartReceivingRewards(s.providerCtx()) * providerKeeper.GetBlocksPerEpoch(s.providerCtx()) + numberOfBlocksToStartReceivingRewards := providerKeeper.GetNumberOfEpochsToStartReceivingRewards(s.providerCtx()) * providerKeeper.GetBlocksPerEpoch(s.providerCtx()) for s.providerCtx().BlockHeight() <= numberOfBlocksToStartReceivingRewards { s.providerChain.NextBlock() @@ -531,13 +530,13 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { testCases := []struct { name string - setup func(sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) + setup func(*CCVTestSuite, sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) rewardsAllocated bool expErr bool }{ { "invalid IBC packet", - func(sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) { + func(*CCVTestSuite, sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) { packet = channeltypes.Packet{} }, false, @@ -545,7 +544,7 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "IBC packet sender isn't a consumer chain", - func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { // make the sender consumer chain impossible to identify packet.DestinationChannel = "CorruptedChannelId" }, @@ -554,8 +553,8 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "IBC Transfer recipient is not the consumer rewards pool address", - func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { - data.Receiver = "cosmos149lw9fktlqfed3zt8ah48r5czmsug5s7kw77u9" // random acct address + func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + data.Receiver = s.providerChain.SenderAccount.GetAddress().String() // random acct address packet.Data = data.GetBytes() }, false, @@ -563,13 +562,14 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "IBC Transfer coin denom isn't registered", - func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) {}, + func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + }, false, false, }, { "successful token transfer to empty pool", - func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { keeper.SetConsumerRewardDenom( s.providerCtx(), getIBCDenom(packet.DestinationPort, packet.DestinationChannel), @@ -580,7 +580,7 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "successful token transfer to filled pool", - func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { keeper.SetConsumerRewardDenom( ctx, getIBCDenom(packet.DestinationPort, packet.DestinationChannel), @@ -654,7 +654,7 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { ).IBCDenom() } - tc.setup(s.providerCtx(), &providerKeeper, bankKeeper) + tc.setup(s, s.providerCtx(), &providerKeeper, bankKeeper) cbs, ok := s.providerChain.App.GetIBCKeeper().Router.GetRoute(transfertypes.ModuleName) s.Require().True(ok) From 04a1408e0f7bc041affbba5a19af7db2738c6532 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Mon, 5 Aug 2024 14:06:37 +0200 Subject: [PATCH 2/4] Hardcode address and adjust comment --- tests/integration/distribution.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go index 384486f873..8d6613cf1f 100644 --- a/tests/integration/distribution.go +++ b/tests/integration/distribution.go @@ -528,15 +528,18 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { getIBCDenom func(string, string) string ) + // set up an arbitrary address that is not the consumer rewards pool address + notConsumerRewardsPoolAddr := s.providerChain.SenderAccount.GetAddress().String() + testCases := []struct { name string - setup func(*CCVTestSuite, sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) + setup func(sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) rewardsAllocated bool expErr bool }{ { "invalid IBC packet", - func(*CCVTestSuite, sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) { + func(sdk.Context, *providerkeeper.Keeper, icstestingutils.TestBankKeeper) { packet = channeltypes.Packet{} }, false, @@ -544,7 +547,7 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "IBC packet sender isn't a consumer chain", - func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { // make the sender consumer chain impossible to identify packet.DestinationChannel = "CorruptedChannelId" }, @@ -553,8 +556,8 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "IBC Transfer recipient is not the consumer rewards pool address", - func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { - data.Receiver = s.providerChain.SenderAccount.GetAddress().String() // random acct address + func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + data.Receiver = notConsumerRewardsPoolAddr packet.Data = data.GetBytes() }, false, @@ -562,14 +565,14 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "IBC Transfer coin denom isn't registered", - func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { }, false, false, }, { "successful token transfer to empty pool", - func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { keeper.SetConsumerRewardDenom( s.providerCtx(), getIBCDenom(packet.DestinationPort, packet.DestinationChannel), @@ -580,7 +583,7 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "successful token transfer to filled pool", - func(s *CCVTestSuite, ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { + func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { keeper.SetConsumerRewardDenom( ctx, getIBCDenom(packet.DestinationPort, packet.DestinationChannel), @@ -654,7 +657,7 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { ).IBCDenom() } - tc.setup(s, s.providerCtx(), &providerKeeper, bankKeeper) + tc.setup(s.providerCtx(), &providerKeeper, bankKeeper) cbs, ok := s.providerChain.App.GetIBCKeeper().Router.GetRoute(transfertypes.ModuleName) s.Require().True(ok) From a4257b61c49aa4fa00b83e73569db05e5e9e7401 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Mon, 5 Aug 2024 14:07:21 +0200 Subject: [PATCH 3/4] Revert line change --- tests/integration/distribution.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go index 8d6613cf1f..bd7fb21622 100644 --- a/tests/integration/distribution.go +++ b/tests/integration/distribution.go @@ -138,7 +138,8 @@ func (s *CCVTestSuite) TestRewardsDistribution() { consuValsRewards := consumerValsOutstandingRewardsFunc(s.providerCtx()) // increase the block height so validators are eligible for consumer rewards (see `IsEligibleForConsumerRewards`) - numberOfBlocksToStartReceivingRewards := providerKeeper.GetNumberOfEpochsToStartReceivingRewards(s.providerCtx()) * providerKeeper.GetBlocksPerEpoch(s.providerCtx()) + numberOfBlocksToStartReceivingRewards := + providerKeeper.GetNumberOfEpochsToStartReceivingRewards(s.providerCtx()) * providerKeeper.GetBlocksPerEpoch(s.providerCtx()) for s.providerCtx().BlockHeight() <= numberOfBlocksToStartReceivingRewards { s.providerChain.NextBlock() From 8504f16828001ff212b72032e362fac28d24af58 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Mon, 5 Aug 2024 14:08:07 +0200 Subject: [PATCH 4/4] Revert formatting change --- tests/integration/distribution.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go index bd7fb21622..6d6cead31c 100644 --- a/tests/integration/distribution.go +++ b/tests/integration/distribution.go @@ -566,8 +566,7 @@ func (s *CCVTestSuite) TestIBCTransferMiddleware() { }, { "IBC Transfer coin denom isn't registered", - func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) { - }, + func(ctx sdk.Context, keeper *providerkeeper.Keeper, bankKeeper icstestingutils.TestBankKeeper) {}, false, false, },