From 4612ced68501bf18f8aff3f5238f8300d8425c7b Mon Sep 17 00:00:00 2001 From: swelf Date: Wed, 11 Oct 2023 12:04:38 +0300 Subject: [PATCH] empty bypassMinFee list --- app/upgrades/nextupgrade/upgrades.go | 9 +-------- app/upgrades/nextupgrade/upgrades_test.go | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/upgrades/nextupgrade/upgrades.go b/app/upgrades/nextupgrade/upgrades.go index 6a17963e6..3efecdbc2 100644 --- a/app/upgrades/nextupgrade/upgrades.go +++ b/app/upgrades/nextupgrade/upgrades.go @@ -17,8 +17,6 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee/types" v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ccvconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types" builderkeeper "github.com/skip-mev/pob/x/builder/keeper" buildertypes "github.com/skip-mev/pob/x/builder/types" @@ -260,12 +258,7 @@ func migrateGlobalFees(ctx sdk.Context, keepers *upgrades.UpgradeKeepers) error ctx.Logger().Info("Global fees was set successfully") - defaultBypassFeeMessages := []string{ - sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), - sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), - sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), - } - keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &defaultBypassFeeMessages) + keepers.GlobalFeeSubspace.Set(ctx, types.ParamStoreKeyBypassMinFeeMsgTypes, &[]string{}) ctx.Logger().Info("Bypass min fee msg types was set successfully") diff --git a/app/upgrades/nextupgrade/upgrades_test.go b/app/upgrades/nextupgrade/upgrades_test.go index f3146ae7a..453aae2e1 100644 --- a/app/upgrades/nextupgrade/upgrades_test.go +++ b/app/upgrades/nextupgrade/upgrades_test.go @@ -20,8 +20,6 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/gaia/v11/x/globalfee" globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types" - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/stretchr/testify/suite" "github.com/neutron-org/neutron/app/upgrades/nextupgrade" @@ -98,12 +96,7 @@ func (suite *UpgradeTestSuite) TestGlobalFeesUpgrade() { var actualBypassFeeMessages []string globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyBypassMinFeeMsgTypes, &actualBypassFeeMessages) - requiredBypassMinFeeMsgTypes := []string{ - sdk.MsgTypeURL(&ibcchanneltypes.MsgRecvPacket{}), - sdk.MsgTypeURL(&ibcchanneltypes.MsgAcknowledgement{}), - sdk.MsgTypeURL(&ibcclienttypes.MsgUpdateClient{}), - } - suite.Require().Equal(requiredBypassMinFeeMsgTypes, actualBypassFeeMessages) + suite.Require().Equal(0, len(actualBypassFeeMessages)) var actualTotalBypassMinFeeMsgGasUsage uint64 globalFeeSubspace.Get(ctx, globalfeetypes.ParamStoreKeyMaxTotalBypassMinFeeMsgGasUsage, &actualTotalBypassMinFeeMsgGasUsage)