From 26d8080d75662ea2f1155fce446ebda7a915d521 Mon Sep 17 00:00:00 2001 From: Justin Tieri <37750742+jtieri@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:41:34 -0500 Subject: [PATCH] refactor: remove the ability to take a fee for each forwarded packet (#202) * refactor: remove the ability to take a fee that is sent to the community pool * fix: mocks * fix: remove WithFee unit test (no longer used due to fee refactor) * fix(e2e): upgrade test --------- Co-authored-by: Reece Williams --- middleware/packet-forward-middleware/Makefile | 3 +- .../e2e/forward_timeout_test.go | 141 +++- .../e2e/upgrade_test.go | 17 - middleware/packet-forward-middleware/go.mod | 10 +- .../packetforward/client/cli/cli.go | 61 -- .../packetforward/keeper/genesis.go | 6 +- .../packetforward/keeper/grpc_query.go | 20 - .../packetforward/keeper/keeper.go | 31 +- .../packetforward/keeper/migrator.go | 29 - .../packetforward/keeper/msg_server.go | 39 -- .../packetforward/keeper/params.go | 40 -- .../packetforward/migrations/v2/migrate.go | 54 -- .../migrations/v2/migrator_test.go | 54 -- .../packetforward/module.go | 14 +- .../packetforward/module_test.go | 68 -- .../packetforward/types/codec.go | 15 +- .../packetforward/types/expected_keepers.go | 5 - .../packetforward/types/genesis.go | 17 +- .../packetforward/types/genesis.pb.go | 303 ++------- .../packetforward/types/keys.go | 5 +- .../packetforward/types/msgs.go | 29 - .../packetforward/types/params.go | 43 -- .../packetforward/types/params_legacy.go | 25 - .../packetforward/types/query.pb.go | 542 ---------------- .../packetforward/types/query.pb.gw.go | 153 ----- .../packetforward/types/tx.pb.go | 605 ------------------ .../proto/packetforward/v1/genesis.proto | 11 - .../proto/packetforward/v1/query.proto | 24 - .../proto/packetforward/v1/tx.proto | 41 -- .../test/mock/bank_keeper.go | 17 +- .../test/mock/channel_keeper.go | 13 +- .../test/mock/distribution_keeper.go | 50 -- .../test/mock/ibc_module.go | 23 +- .../test/mock/ics4_wrapper.go | 11 +- .../test/mock/transfer_keeper.go | 13 +- .../packet-forward-middleware/test/setup.go | 40 +- .../testing/simapp/app.go | 2 - .../testing/simapp/upgrades/upgrades.go | 17 - 38 files changed, 258 insertions(+), 2333 deletions(-) delete mode 100644 middleware/packet-forward-middleware/packetforward/client/cli/cli.go delete mode 100644 middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go delete mode 100644 middleware/packet-forward-middleware/packetforward/keeper/migrator.go delete mode 100644 middleware/packet-forward-middleware/packetforward/keeper/msg_server.go delete mode 100644 middleware/packet-forward-middleware/packetforward/keeper/params.go delete mode 100644 middleware/packet-forward-middleware/packetforward/migrations/v2/migrate.go delete mode 100644 middleware/packet-forward-middleware/packetforward/migrations/v2/migrator_test.go delete mode 100644 middleware/packet-forward-middleware/packetforward/types/msgs.go delete mode 100644 middleware/packet-forward-middleware/packetforward/types/params.go delete mode 100644 middleware/packet-forward-middleware/packetforward/types/params_legacy.go delete mode 100644 middleware/packet-forward-middleware/packetforward/types/query.pb.go delete mode 100644 middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go delete mode 100644 middleware/packet-forward-middleware/packetforward/types/tx.pb.go delete mode 100644 middleware/packet-forward-middleware/proto/packetforward/v1/query.proto delete mode 100644 middleware/packet-forward-middleware/proto/packetforward/v1/tx.proto delete mode 100644 middleware/packet-forward-middleware/test/mock/distribution_keeper.go diff --git a/middleware/packet-forward-middleware/Makefile b/middleware/packet-forward-middleware/Makefile index d6f8e17e..5158d775 100644 --- a/middleware/packet-forward-middleware/Makefile +++ b/middleware/packet-forward-middleware/Makefile @@ -142,9 +142,8 @@ cosmovisor: .PHONY: build build-linux build-simd-all build-simd-linux cosmovisor mocks: $(MOCKS_DIR) - go install go.uber.org/mock/mockgen@v0.2.0 + go install go.uber.org/mock/mockgen@v0.4.0 mockgen -package=mock -destination=./test/mock/transfer_keeper.go $(GOMOD)/packetforward/types TransferKeeper - mockgen -package=mock -destination=./test/mock/distribution_keeper.go $(GOMOD)/packetforward/types DistributionKeeper mockgen -package=mock -destination=./test/mock/bank_keeper.go $(GOMOD)/packetforward/types BankKeeper mockgen -package=mock -destination=./test/mock/channel_keeper.go $(GOMOD)/packetforward/types ChannelKeeper mockgen -package=mock -destination=./test/mock/ics4_wrapper.go github.com/cosmos/ibc-go/v8/modules/core/05-port/types ICS4Wrapper diff --git a/middleware/packet-forward-middleware/e2e/forward_timeout_test.go b/middleware/packet-forward-middleware/e2e/forward_timeout_test.go index 6fb3d940..dec235e9 100644 --- a/middleware/packet-forward-middleware/e2e/forward_timeout_test.go +++ b/middleware/packet-forward-middleware/e2e/forward_timeout_test.go @@ -304,7 +304,7 @@ func TestTimeoutOnForward(t *testing.T) { _, err = testutil.PollForAck(ctx, chainA, chainAHeight, chainAHeight+30, transferTx.Packet) require.NoError(t, err) - err = testutil.WaitForBlocks(ctx, 5, chainA) + err = testutil.WaitForBlocks(ctx, 10, chainA) require.NoError(t, err) // Assert balances are updated to reflect tokens now being on ChainD @@ -411,4 +411,143 @@ func TestTimeoutOnForward(t *testing.T) { require.True(t, firstHopEscrowBalance.Equal(transferAmount)) require.True(t, secondHopEscrowBalance.Equal(transferAmount)) require.True(t, thirdHopEscrowBalance.Equal(transferAmount)) + + // --- + + // Compose IBC tx that will go from ChainD -> ChainC -> ChainB -> ChainA and succeed. + transfer = ibc.WalletAmount{ + Address: userC.FormattedAddress(), + Denom: thirdHopDenom, + Amount: transferAmount, + } + + secondHopMetadata = &PacketMetadata{ + Forward: &ForwardMetadata{ + Receiver: userA.FormattedAddress(), + Channel: baChan.ChannelID, + Port: baChan.PortID, + }, + } + nextBz, err = json.Marshal(secondHopMetadata) + require.NoError(t, err) + next = string(nextBz) + + firstHopMetadata = &PacketMetadata{ + Forward: &ForwardMetadata{ + Receiver: userB.FormattedAddress(), + Channel: cbChan.ChannelID, + Port: cbChan.PortID, + Next: &next, + }, + } + + memo, err = json.Marshal(firstHopMetadata) + require.NoError(t, err) + + chainDHeight, err = chainD.Height(ctx) + require.NoError(t, err) + + transferTx, err = chainD.SendIBCTransfer(ctx, dcChan.ChannelID, userD.KeyName(), transfer, ibc.TransferOptions{Memo: string(memo)}) + require.NoError(t, err) + + _, err = testutil.PollForAck(ctx, chainD, chainDHeight, chainDHeight+25, transferTx.Packet) + require.NoError(t, err) + + err = testutil.WaitForBlocks(ctx, 5, chainD) + require.NoError(t, err) + + // Assert balances to ensure timeout happened and user funds are still present on ChainD + chainABalance, err = chainA.GetBalance(ctx, userA.FormattedAddress(), chainA.Config().Denom) + require.NoError(t, err) + + chainBBalance, err = chainB.GetBalance(ctx, userB.FormattedAddress(), firstHopIBCDenom) + require.NoError(t, err) + + chainCBalance, err = chainC.GetBalance(ctx, userC.FormattedAddress(), secondHopIBCDenom) + require.NoError(t, err) + + chainDBalance, err = chainD.GetBalance(ctx, userD.FormattedAddress(), thirdHopIBCDenom) + require.NoError(t, err) + + require.True(t, chainABalance.Equal(initBal)) + require.True(t, chainBBalance.Equal(zeroBal)) + require.True(t, chainCBalance.Equal(zeroBal)) + require.True(t, chainDBalance.Equal(zeroBal)) + + firstHopEscrowBalance, err = chainA.GetBalance(ctx, firstHopEscrowAccount, chainA.Config().Denom) + require.NoError(t, err) + + secondHopEscrowBalance, err = chainB.GetBalance(ctx, secondHopEscrowAccount, firstHopIBCDenom) + require.NoError(t, err) + + thirdHopEscrowBalance, err = chainC.GetBalance(ctx, thirdHopEscrowAccount, secondHopIBCDenom) + require.NoError(t, err) + + require.True(t, firstHopEscrowBalance.Equal(zeroBal)) + require.True(t, secondHopEscrowBalance.Equal(zeroBal)) + require.True(t, thirdHopEscrowBalance.Equal(zeroBal)) + + // ----- 2 + + // Compose IBC tx that will go from ChainD -> ChainC -> ChainB -> ChainA and succeed. + transfer = ibc.WalletAmount{ + Address: userB.FormattedAddress(), + Denom: chainA.Config().Denom, + Amount: transferAmount, + } + + firstHopMetadata = &PacketMetadata{ + Forward: &ForwardMetadata{ + Receiver: userA.FormattedAddress(), + Channel: baChan.ChannelID, + Port: baChan.PortID, + Timeout: 1 * time.Second, + }, + } + + memo, err = json.Marshal(firstHopMetadata) + require.NoError(t, err) + + chainAHeight, err = chainA.Height(ctx) + require.NoError(t, err) + + transferTx, err = chainA.SendIBCTransfer(ctx, abChan.ChannelID, userA.KeyName(), transfer, ibc.TransferOptions{Memo: string(memo)}) + require.NoError(t, err) + + _, err = testutil.PollForAck(ctx, chainA, chainAHeight, chainAHeight+25, transferTx.Packet) + require.NoError(t, err) + + err = testutil.WaitForBlocks(ctx, 5, chainA) + require.NoError(t, err) + + // Assert balances to ensure timeout happened and user funds are still present on ChainD + chainABalance, err = chainA.GetBalance(ctx, userA.FormattedAddress(), chainA.Config().Denom) + require.NoError(t, err) + + chainBBalance, err = chainB.GetBalance(ctx, userB.FormattedAddress(), firstHopIBCDenom) + require.NoError(t, err) + + chainCBalance, err = chainC.GetBalance(ctx, userC.FormattedAddress(), secondHopIBCDenom) + require.NoError(t, err) + + chainDBalance, err = chainD.GetBalance(ctx, userD.FormattedAddress(), thirdHopIBCDenom) + require.NoError(t, err) + + require.True(t, chainABalance.Equal(initBal)) + require.True(t, chainBBalance.Equal(zeroBal)) + require.True(t, chainCBalance.Equal(zeroBal)) + require.True(t, chainDBalance.Equal(zeroBal)) + + firstHopEscrowBalance, err = chainA.GetBalance(ctx, firstHopEscrowAccount, chainA.Config().Denom) + require.NoError(t, err) + + secondHopEscrowBalance, err = chainB.GetBalance(ctx, secondHopEscrowAccount, firstHopIBCDenom) + require.NoError(t, err) + + thirdHopEscrowBalance, err = chainC.GetBalance(ctx, thirdHopEscrowAccount, secondHopIBCDenom) + require.NoError(t, err) + + require.True(t, firstHopEscrowBalance.Equal(zeroBal)) + require.True(t, secondHopEscrowBalance.Equal(zeroBal)) + require.True(t, thirdHopEscrowBalance.Equal(zeroBal)) } diff --git a/middleware/packet-forward-middleware/e2e/upgrade_test.go b/middleware/packet-forward-middleware/e2e/upgrade_test.go index 0314fa2e..77ea90ef 100644 --- a/middleware/packet-forward-middleware/e2e/upgrade_test.go +++ b/middleware/packet-forward-middleware/e2e/upgrade_test.go @@ -2,7 +2,6 @@ package e2e import ( "context" - "encoding/json" "fmt" "testing" "time" @@ -16,8 +15,6 @@ import ( "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/strangelove-ventures/interchaintest/v8/testutil" "github.com/stretchr/testify/require" - - packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" ) const ( @@ -100,20 +97,6 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, upgradeRepo, upgradeDockerT ValidatorVoting(t, ctx, chain, proposalID, height, haltHeight) UpgradeNodes(t, ctx, chain, client, haltHeight, upgradeRepo, upgradeDockerTag) - - // Validate the PFM subspace -> keeper migration was successful. - cmd := []string{ - chain.Config().Bin, "q", "packetforward", "params", "--output=json", "--node", chain.GetRPCAddress(), - } - stdout, _, err := chain.Exec(ctx, cmd, nil) - fmt.Println("stdout", string(stdout)) - require.NoError(t, err, "error fetching pfm params") - - var params packetforwardtypes.Params - err = json.Unmarshal(stdout, ¶ms) - require.NoError(t, err, "error unmarshalling pfm params") - t.Logf("params: %+v", params) - require.Equal(t, sdkmath.LegacyNewDec(0), params.FeePercentage, "fee percentage not equal to expected value") } func SubmitUpgradeProposal(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, upgradeName string, haltHeight uint64) string { diff --git a/middleware/packet-forward-middleware/go.mod b/middleware/packet-forward-middleware/go.mod index bd0d8384..2bb7804a 100644 --- a/middleware/packet-forward-middleware/go.mod +++ b/middleware/packet-forward-middleware/go.mod @@ -1,5 +1,7 @@ go 1.21 +toolchain go1.22.5 + module github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 require ( @@ -17,12 +19,10 @@ require ( cosmossdk.io/x/upgrade v0.1.1 github.com/cometbft/cometbft v0.38.6 github.com/cosmos/cosmos-db v1.0.2 - github.com/cosmos/cosmos-proto v1.0.0-beta.4 github.com/cosmos/cosmos-sdk v0.50.5 github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/ibc-go/modules/capability v1.0.0 github.com/cosmos/ibc-go/v8 v8.1.1 - github.com/golang/protobuf v1.5.4 github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/hashicorp/go-metrics v0.5.2 @@ -33,8 +33,6 @@ require ( github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 go.uber.org/mock v0.4.0 - google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 - google.golang.org/grpc v1.62.0 ) require ( @@ -69,6 +67,7 @@ require ( github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/cometbft/cometbft-db v0.9.1 // indirect github.com/cosmos/btcutil v1.0.5 // indirect + github.com/cosmos/cosmos-proto v1.0.0-beta.4 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v1.0.1 // indirect @@ -101,6 +100,7 @@ require ( github.com/golang/glog v1.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -192,7 +192,9 @@ require ( google.golang.org/api v0.162.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect + google.golang.org/grpc v1.62.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/middleware/packet-forward-middleware/packetforward/client/cli/cli.go b/middleware/packet-forward-middleware/packetforward/client/cli/cli.go deleted file mode 100644 index c18f42ae..00000000 --- a/middleware/packet-forward-middleware/packetforward/client/cli/cli.go +++ /dev/null @@ -1,61 +0,0 @@ -package cli - -import ( - "fmt" - - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" - "github.com/spf13/cobra" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/cosmos-sdk/version" -) - -// GetQueryCmd returns the query commands for packetforward -func GetQueryCmd() *cobra.Command { - queryCmd := &cobra.Command{ - Use: "packetforward", - Short: "Querying commands for the packetforward module", - DisableFlagParsing: true, - SuggestionsMinimumDistance: 2, - } - - queryCmd.AddCommand( - GetCmdParams(), - ) - - return queryCmd -} - -// GetCmdParams returns the command handler for packetforward parameter querying. -func GetCmdParams() *cobra.Command { - cmd := &cobra.Command{ - Use: "params", - Short: "Query the current packetforward parameters", - Long: "Query the current packetforward parameters", - Args: cobra.NoArgs, - Example: fmt.Sprintf("%s query packetforward params", version.AppName), - RunE: func(cmd *cobra.Command, _ []string) error { - clientCtx, err := client.GetClientQueryContext(cmd) - if err != nil { - return err - } - queryClient := types.NewQueryClient(clientCtx) - - res, err := queryClient.Params(cmd.Context(), &types.QueryParamsRequest{}) - if err != nil { - return err - } - return clientCtx.PrintProto(res.Params) - }, - } - - flags.AddQueryFlagsToCmd(cmd) - - return cmd -} - -// NewTxCmd returns the transaction commands for packetforward -func NewTxCmd() *cobra.Command { - return nil -} diff --git a/middleware/packet-forward-middleware/packetforward/keeper/genesis.go b/middleware/packet-forward-middleware/packetforward/keeper/genesis.go index 37c65aa9..2b5a4b32 100644 --- a/middleware/packet-forward-middleware/packetforward/keeper/genesis.go +++ b/middleware/packet-forward-middleware/packetforward/keeper/genesis.go @@ -8,10 +8,6 @@ import ( // InitGenesis func (k Keeper) InitGenesis(ctx sdk.Context, state types.GenesisState) { - if err := k.SetParams(ctx, state.Params); err != nil { - panic(err) - } - // Initialize store refund path for forwarded packets in genesis state that have not yet been acked. store := ctx.KVStore(k.storeKey) for key, value := range state.InFlightPackets { @@ -34,5 +30,5 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { k.cdc.MustUnmarshal(itr.Value(), &inFlightPacket) inFlightPackets[string(itr.Key())] = inFlightPacket } - return &types.GenesisState{Params: k.GetParams(ctx), InFlightPackets: inFlightPackets} + return &types.GenesisState{InFlightPackets: inFlightPackets} } diff --git a/middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go b/middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go deleted file mode 100644 index f6d96058..00000000 --- a/middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go +++ /dev/null @@ -1,20 +0,0 @@ -package keeper - -import ( - "context" - - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var _ types.QueryServer = Keeper{} - -func (k Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { - ctx := sdk.UnwrapSDKContext(c) - params := k.GetParams(ctx) - - return &types.QueryParamsResponse{ - Params: ¶ms, - }, nil -} diff --git a/middleware/packet-forward-middleware/packetforward/keeper/keeper.go b/middleware/packet-forward-middleware/packetforward/keeper/keeper.go index 687e3af0..44ca9f8d 100644 --- a/middleware/packet-forward-middleware/packetforward/keeper/keeper.go +++ b/middleware/packet-forward-middleware/packetforward/keeper/keeper.go @@ -48,7 +48,6 @@ type Keeper struct { transferKeeper types.TransferKeeper channelKeeper types.ChannelKeeper - distrKeeper types.DistributionKeeper bankKeeper types.BankKeeper ics4Wrapper porttypes.ICS4Wrapper @@ -63,7 +62,6 @@ func NewKeeper( key storetypes.StoreKey, transferKeeper types.TransferKeeper, channelKeeper types.ChannelKeeper, - distrKeeper types.DistributionKeeper, bankKeeper types.BankKeeper, ics4Wrapper porttypes.ICS4Wrapper, authority string, @@ -73,7 +71,6 @@ func NewKeeper( storeKey: key, transferKeeper: transferKeeper, channelKeeper: channelKeeper, - distrKeeper: distrKeeper, bankKeeper: bankKeeper, ics4Wrapper: ics4Wrapper, authority: authority, @@ -316,27 +313,6 @@ func (k *Keeper) ForwardTransferPacket( labels []metrics.Label, nonrefundable bool, ) error { - var err error - feeAmount := sdkmath.LegacyNewDecFromInt(token.Amount).Mul(k.GetFeePercentage(ctx)).RoundInt() - packetAmount := token.Amount.Sub(feeAmount) - feeCoins := sdk.Coins{sdk.NewCoin(token.Denom, feeAmount)} - packetCoin := sdk.NewCoin(token.Denom, packetAmount) - - // pay fees - if feeAmount.IsPositive() { - hostAccAddr, err := sdk.AccAddressFromBech32(receiver) - if err != nil { - return err - } - err = k.distrKeeper.FundCommunityPool(ctx, feeCoins, hostAccAddr) - if err != nil { - k.Logger(ctx).Error("packetForwardMiddleware error funding community pool", - "error", err, - ) - return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) - } - } - memo := "" // set memo for next transfer with next from this transfer. @@ -354,7 +330,7 @@ func (k *Keeper) ForwardTransferPacket( msgTransfer := transfertypes.NewMsgTransfer( metadata.Port, metadata.Channel, - packetCoin, + token, receiver, metadata.Receiver, DefaultTransferPacketTimeoutHeight, @@ -365,7 +341,7 @@ func (k *Keeper) ForwardTransferPacket( k.Logger(ctx).Debug("packetForwardMiddleware ForwardTransferPacket", "port", metadata.Port, "channel", metadata.Channel, "sender", receiver, "receiver", metadata.Receiver, - "amount", packetCoin.Amount.String(), "denom", packetCoin.Denom, + "amount", token.Amount.String(), "denom", token.Denom, ) // send tokens to destination @@ -377,7 +353,7 @@ func (k *Keeper) ForwardTransferPacket( k.Logger(ctx).Error("packetForwardMiddleware ForwardTransferPacket error", "port", metadata.Port, "channel", metadata.Channel, "sender", receiver, "receiver", metadata.Receiver, - "amount", packetCoin.Amount.String(), "denom", packetCoin.Denom, + "amount", token.Amount.String(), "denom", token.Denom, "error", err, ) return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) @@ -386,7 +362,6 @@ func (k *Keeper) ForwardTransferPacket( // Store the following information in keeper: // key - information about forwarded packet: src_channel (parsedReceiver.Channel), src_port (parsedReceiver.Port), sequence // value - information about original packet for refunding if necessary: retries, srcPacketSender, srcPacket.DestinationChannel, srcPacket.DestinationPort - if inFlightPacket == nil { inFlightPacket = &types.InFlightPacket{ PacketData: srcPacket.Data, diff --git a/middleware/packet-forward-middleware/packetforward/keeper/migrator.go b/middleware/packet-forward-middleware/packetforward/keeper/migrator.go deleted file mode 100644 index bb57ffc4..00000000 --- a/middleware/packet-forward-middleware/packetforward/keeper/migrator.go +++ /dev/null @@ -1,29 +0,0 @@ -package keeper - -import ( - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/exported" - v2 "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/migrations/v2" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// Migrator is a struct for handling in-place state migrations. -type Migrator struct { - keeper *Keeper - legacySubspace exported.Subspace -} - -func NewMigrator(k *Keeper, ss exported.Subspace) Migrator { - return Migrator{ - keeper: k, - legacySubspace: ss, - } -} - -// Migrate1to2 migrates the module state from the consensus version 1 to -// version 2. Specifically, it takes the parameters that are currently stored -// and managed by the x/params modules and stores them directly into the -// module state. -func (m Migrator) Migrate1to2(ctx sdk.Context) error { - return v2.Migrate(ctx, ctx.KVStore(m.keeper.storeKey), m.legacySubspace, m.keeper.cdc) -} diff --git a/middleware/packet-forward-middleware/packetforward/keeper/msg_server.go b/middleware/packet-forward-middleware/packetforward/keeper/msg_server.go deleted file mode 100644 index a38547b9..00000000 --- a/middleware/packet-forward-middleware/packetforward/keeper/msg_server.go +++ /dev/null @@ -1,39 +0,0 @@ -package keeper - -import ( - "context" - - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" - - "cosmossdk.io/errors" - - sdk "github.com/cosmos/cosmos-sdk/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" -) - -var _ types.MsgServer = msgServer{} - -type msgServer struct { - *Keeper -} - -// NewMsgServerImpl returns an implementation of the x/packetforward MsgServer interface. -func NewMsgServerImpl(k *Keeper) types.MsgServer { - return &msgServer{ - Keeper: k, - } -} - -// UpdateParams implements types.MsgServer. -func (ms msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { - if ms.authority != req.Authority { - return nil, errors.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", ms.authority, req.Authority) - } - - ctx := sdk.UnwrapSDKContext(goCtx) - if err := ms.SetParams(ctx, req.Params); err != nil { - return nil, err - } - - return &types.MsgUpdateParamsResponse{}, nil -} diff --git a/middleware/packet-forward-middleware/packetforward/keeper/params.go b/middleware/packet-forward-middleware/packetforward/keeper/params.go deleted file mode 100644 index 8ee04dd9..00000000 --- a/middleware/packet-forward-middleware/packetforward/keeper/params.go +++ /dev/null @@ -1,40 +0,0 @@ -package keeper - -import ( - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" - - sdkmath "cosmossdk.io/math" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// SetParams sets the module parameters. -func (k Keeper) SetParams(ctx sdk.Context, p types.Params) error { - if err := p.Validate(); err != nil { - return err - } - - store := ctx.KVStore(k.storeKey) - bz := k.cdc.MustMarshal(&p) - store.Set(types.ParamsKey, bz) - return nil -} - -// GetParams returns the current module parameters. -func (k Keeper) GetParams(ctx sdk.Context) types.Params { - var p types.Params - - store := ctx.KVStore(k.storeKey) - bz := store.Get(types.ParamsKey) - if bz == nil { - return p - } - - k.cdc.MustUnmarshal(bz, &p) - return p -} - -// GetFeePercentage retrieves the fee percentage for forwarded packets from the store. -func (k Keeper) GetFeePercentage(ctx sdk.Context) sdkmath.LegacyDec { - return k.GetParams(ctx).FeePercentage -} diff --git a/middleware/packet-forward-middleware/packetforward/migrations/v2/migrate.go b/middleware/packet-forward-middleware/packetforward/migrations/v2/migrate.go deleted file mode 100644 index 72fd797f..00000000 --- a/middleware/packet-forward-middleware/packetforward/migrations/v2/migrate.go +++ /dev/null @@ -1,54 +0,0 @@ -package v2 - -import ( - "fmt" - - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/exported" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" - - storetypes "cosmossdk.io/store/types" - - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" -) - -// Migrate migrates the x/packetforward module state from the consensus version 1 to -// version 2. Specifically, it takes the parameters that are currently stored -// and managed by the x/params modules and stores them directly into the x/packetforward -// module state. -func Migrate( - ctx sdk.Context, - store storetypes.KVStore, - legacySubspace exported.Subspace, - cdc codec.BinaryCodec, -) error { - var currParams types.Params - legacySubspace.GetParamSet(ctx, &currParams) - - if err := currParams.Validate(); err != nil { - return err - } - - bz := cdc.MustMarshal(&currParams) - store.Set(types.ParamsKey, bz) - - return validate(store, cdc, currParams) -} - -func validate(store storetypes.KVStore, cdc codec.BinaryCodec, currParams types.Params) error { - var res types.Params - bz := store.Get(types.ParamsKey) - if bz == nil { - return fmt.Errorf("expected params at key %s but not found", types.ParamsKey) - } - - if err := cdc.Unmarshal(bz, &res); err != nil { - return err - } - - if !currParams.FeePercentage.Equal(res.FeePercentage) { - return fmt.Errorf("expected %s but got %s", currParams, res) - } - - return nil -} diff --git a/middleware/packet-forward-middleware/packetforward/migrations/v2/migrator_test.go b/middleware/packet-forward-middleware/packetforward/migrations/v2/migrator_test.go deleted file mode 100644 index 6070962a..00000000 --- a/middleware/packet-forward-middleware/packetforward/migrations/v2/migrator_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package v2_test - -import ( - "testing" - - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/exported" - v2 "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/migrations/v2" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" - "github.com/stretchr/testify/require" - - sdkmath "cosmossdk.io/math" - storetypes "cosmossdk.io/store/types" - - "github.com/cosmos/cosmos-sdk/testutil" - sdk "github.com/cosmos/cosmos-sdk/types" - moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" -) - -// 0.02 -var migrateExpected = sdkmath.LegacyNewDecWithPrec(2, 2) - -type mockSubspace struct { - ps types.Params -} - -func newMockSubspace(ps types.Params) mockSubspace { - return mockSubspace{ps: ps} -} - -func (ms mockSubspace) GetParamSet(_ sdk.Context, ps exported.ParamSet) { - *ps.(*types.Params) = ms.ps -} - -// TestMigrate validates the legacySubstore value moves to the new params key. -func TestMigrate(t *testing.T) { - encCfg := moduletestutil.MakeTestEncodingConfig(packetforward.AppModuleBasic{}) - cdc := encCfg.Codec - - storeKey := storetypes.NewKVStoreKey(types.ModuleName) - tKey := storetypes.NewTransientStoreKey("transient_test") - ctx := testutil.DefaultContext(storeKey, tKey) - store := ctx.KVStore(storeKey) - - legacySubspace := newMockSubspace(types.Params{ - FeePercentage: migrateExpected, - }) - require.NoError(t, v2.Migrate(ctx, store, legacySubspace, cdc)) - - var res types.Params - bz := store.Get(types.ParamsKey) - require.NoError(t, cdc.Unmarshal(bz, &res)) - require.Equal(t, legacySubspace.ps, res) -} diff --git a/middleware/packet-forward-middleware/packetforward/module.go b/middleware/packet-forward-middleware/packetforward/module.go index 41118fff..a96a0364 100644 --- a/middleware/packet-forward-middleware/packetforward/module.go +++ b/middleware/packet-forward-middleware/packetforward/module.go @@ -1,11 +1,9 @@ package packetforward import ( - "context" "encoding/json" "fmt" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/client/cli" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/exported" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" @@ -64,17 +62,16 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the packetforward module. func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { - _ = types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) } // GetTxCmd implements AppModuleBasic interface func (AppModuleBasic) GetTxCmd() *cobra.Command { - return cli.NewTxCmd() + return nil } // GetQueryCmd implements AppModuleBasic interface func (AppModuleBasic) GetQueryCmd() *cobra.Command { - return cli.GetQueryCmd() + return nil } // AppModule represents the AppModule for this module @@ -107,13 +104,6 @@ func (AppModule) QuerierRoute() string { // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { - types.RegisterQueryServer(cfg.QueryServer(), am.keeper) - types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) - - m := keeper.NewMigrator(am.keeper, am.legacySubspace) - if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil { - panic(fmt.Sprintf("failed to migrate x/%s from version 1 to 2: %v", types.ModuleName, err)) - } } // InitGenesis performs genesis initialization for the packetforward module. It returns diff --git a/middleware/packet-forward-middleware/packetforward/module_test.go b/middleware/packet-forward-middleware/packetforward/module_test.go index 13b59421..6d65001b 100644 --- a/middleware/packet-forward-middleware/packetforward/module_test.go +++ b/middleware/packet-forward-middleware/packetforward/module_test.go @@ -363,74 +363,6 @@ func TestOnRecvPacket_ForwardAmountInt256(t *testing.T) { require.NoError(t, err) } -func TestOnRecvPacket_ForwardWithFee(t *testing.T) { - var err error - ctl := gomock.NewController(t) - defer ctl.Finish() - setup := test.NewTestSetup(t, ctl) - ctx := setup.Initializer.Ctx - cdc := setup.Initializer.Marshaler - forwardMiddleware := setup.ForwardMiddleware - - // Set fee param to 10% - if err := setup.Keepers.PacketForwardKeeper.SetParams(ctx, types.NewParams(sdkmath.LegacyNewDecWithPrec(10, 2))); err != nil { - t.Fatal(err) - } - - denom := makeIBCDenom(testDestinationPort, testDestinationChannel, testDenom) - senderAccAddr := test.AccAddress() - intermediateAccAddr := test.AccAddressFromBech32(t, intermediateAddr) - testCoin := sdk.NewCoin(denom, sdkmath.NewInt(90)) - feeCoins := sdk.Coins{sdk.NewCoin(denom, sdkmath.NewInt(10))} - metadata := &types.PacketMetadata{Forward: &types.ForwardMetadata{ - Receiver: destAddr, - Port: port, - Channel: channel, - }} - packetOrig := transferPacket(t, senderAddr, hostAddr, metadata) - packetModifiedSender := transferPacket(t, senderAddr, intermediateAddr, nil) - packetFwd := transferPacket(t, intermediateAddr, destAddr, nil) - acknowledgement := channeltypes.NewResultAcknowledgement([]byte("test")) - successAck := cdc.MustMarshalJSON(&acknowledgement) - - // Expected mocks - gomock.InOrder( - setup.Mocks.IBCModuleMock.EXPECT().OnRecvPacket(ctx, packetModifiedSender, senderAccAddr). - Return(acknowledgement), - - setup.Mocks.DistributionKeeperMock.EXPECT().FundCommunityPool( - ctx, - feeCoins, - intermediateAccAddr, - ).Return(nil), - - setup.Mocks.TransferKeeperMock.EXPECT().Transfer( - sdk.WrapSDKContext(ctx), - transfertypes.NewMsgTransfer( - port, - channel, - testCoin, - intermediateAddr, - destAddr, - keeper.DefaultTransferPacketTimeoutHeight, - uint64(ctx.BlockTime().UnixNano())+uint64(keeper.DefaultForwardTransferPacketTimeoutTimestamp.Nanoseconds()), - "", - ), - ).Return(&transfertypes.MsgTransferResponse{Sequence: 0}, nil), - - setup.Mocks.IBCModuleMock.EXPECT().OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr). - Return(nil), - ) - - // chain B with packetforward module receives packet and forwards. ack should be nil so that it is not written yet. - ack := forwardMiddleware.OnRecvPacket(ctx, packetOrig, senderAccAddr) - require.Nil(t, ack) - - // ack returned from chain C - err = forwardMiddleware.OnAcknowledgementPacket(ctx, packetFwd, successAck, senderAccAddr) - require.NoError(t, err) -} - func TestOnRecvPacket_ForwardMultihopStringNext(t *testing.T) { var err error ctl := gomock.NewController(t) diff --git a/middleware/packet-forward-middleware/packetforward/types/codec.go b/middleware/packet-forward-middleware/packetforward/types/codec.go index 392f3365..3a4f6648 100644 --- a/middleware/packet-forward-middleware/packetforward/types/codec.go +++ b/middleware/packet-forward-middleware/packetforward/types/codec.go @@ -2,17 +2,12 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/codec/legacy" "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/msgservice" ) -var ( - amino = codec.NewLegacyAmino() - ModuleCdc = codec.NewAminoCodec(amino) -) +var amino = codec.NewLegacyAmino() func init() { RegisterLegacyAminoCodec(amino) @@ -27,15 +22,7 @@ func init() { // RegisterLegacyAminoCodec registers concrete types on the LegacyAmino codec func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(Params{}, "packetforward/Params", nil) - legacy.RegisterAminoMsg(cdc, &MsgUpdateParams{}, "packetforward/MsgUpdateParams") } func RegisterInterfaces(registry types.InterfaceRegistry) { - registry.RegisterImplementations( - (*sdk.Msg)(nil), - &MsgUpdateParams{}, - ) - - msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/middleware/packet-forward-middleware/packetforward/types/expected_keepers.go b/middleware/packet-forward-middleware/packetforward/types/expected_keepers.go index a35b97e3..8363a1fb 100644 --- a/middleware/packet-forward-middleware/packetforward/types/expected_keepers.go +++ b/middleware/packet-forward-middleware/packetforward/types/expected_keepers.go @@ -26,11 +26,6 @@ type ChannelKeeper interface { LookupModuleByChannel(ctx sdk.Context, portID, channelID string) (string, *capabilitytypes.Capability, error) } -// DistributionKeeper defines the expected distribution keeper -type DistributionKeeper interface { - FundCommunityPool(ctx context.Context, amount sdk.Coins, sender sdk.AccAddress) error -} - // BankKeeper defines the expected bank keeper type BankKeeper interface { SendCoins(ctx context.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error diff --git a/middleware/packet-forward-middleware/packetforward/types/genesis.go b/middleware/packet-forward-middleware/packetforward/types/genesis.go index a6f39848..41d18f3e 100644 --- a/middleware/packet-forward-middleware/packetforward/types/genesis.go +++ b/middleware/packet-forward-middleware/packetforward/types/genesis.go @@ -1,22 +1,19 @@ package types -// NewGenesisState creates a pfm GenesisState instance. -func NewGenesisState(params Params, inFlightPackets map[string]InFlightPacket) *GenesisState { - return &GenesisState{ - Params: params, - InFlightPackets: inFlightPackets, - } -} +import "errors" -// DefaultGenesisState returns a GenesisState with a default fee percentage of 0. +// DefaultGenesisState returns a GenesisState with an empty map of in-flight packets. func DefaultGenesisState() *GenesisState { return &GenesisState{ - Params: DefaultParams(), InFlightPackets: make(map[string]InFlightPacket), } } // Validate performs basic genesis state validation returning an error upon any failure. func (gs GenesisState) Validate() error { - return gs.Params.Validate() + if gs.InFlightPackets == nil { + return errors.New("in-flight packets cannot be nil") + } + + return nil } diff --git a/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go b/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go index 190276c2..ada44090 100644 --- a/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go +++ b/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go @@ -4,7 +4,6 @@ package types import ( - cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" @@ -27,7 +26,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the packetforward genesis state type GenesisState struct { - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // key - information about forwarded packet: src_channel // (parsedReceiver.Channel), src_port (parsedReceiver.Port), sequence value - // information about original packet for refunding if necessary: retries, @@ -68,13 +66,6 @@ func (m *GenesisState) XXX_DiscardUnknown() { var xxx_messageInfo_GenesisState proto.InternalMessageInfo -func (m *GenesisState) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - func (m *GenesisState) GetInFlightPackets() map[string]InFlightPacket { if m != nil { return m.InFlightPackets @@ -82,44 +73,6 @@ func (m *GenesisState) GetInFlightPackets() map[string]InFlightPacket { return nil } -// Params defines the set of packetforward parameters. -type Params struct { - FeePercentage cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=fee_percentage,json=feePercentage,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"fee_percentage"` -} - -func (m *Params) Reset() { *m = Params{} } -func (m *Params) String() string { return proto.CompactTextString(m) } -func (*Params) ProtoMessage() {} -func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_afd4e56ea31af982, []int{1} -} -func (m *Params) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Params.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Params) XXX_Merge(src proto.Message) { - xxx_messageInfo_Params.Merge(m, src) -} -func (m *Params) XXX_Size() int { - return m.Size() -} -func (m *Params) XXX_DiscardUnknown() { - xxx_messageInfo_Params.DiscardUnknown(m) -} - -var xxx_messageInfo_Params proto.InternalMessageInfo - // InFlightPacket contains information about original packet for // writing the acknowledgement and refunding if necessary. type InFlightPacket struct { @@ -141,7 +94,7 @@ func (m *InFlightPacket) Reset() { *m = InFlightPacket{} } func (m *InFlightPacket) String() string { return proto.CompactTextString(m) } func (*InFlightPacket) ProtoMessage() {} func (*InFlightPacket) Descriptor() ([]byte, []int) { - return fileDescriptor_afd4e56ea31af982, []int{2} + return fileDescriptor_afd4e56ea31af982, []int{1} } func (m *InFlightPacket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -257,56 +210,49 @@ func (m *InFlightPacket) GetNonrefundable() bool { func init() { proto.RegisterType((*GenesisState)(nil), "packetforward.v1.GenesisState") proto.RegisterMapType((map[string]InFlightPacket)(nil), "packetforward.v1.GenesisState.InFlightPacketsEntry") - proto.RegisterType((*Params)(nil), "packetforward.v1.Params") proto.RegisterType((*InFlightPacket)(nil), "packetforward.v1.InFlightPacket") } func init() { proto.RegisterFile("packetforward/v1/genesis.proto", fileDescriptor_afd4e56ea31af982) } var fileDescriptor_afd4e56ea31af982 = []byte{ - // 659 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0x4d, 0x4b, 0x1b, 0x4d, - 0x1c, 0xcf, 0xc6, 0x18, 0x75, 0x12, 0xdf, 0xe6, 0xd1, 0xe7, 0x59, 0x7c, 0x20, 0x59, 0x82, 0xd0, - 0xa0, 0xb8, 0x8b, 0x0a, 0x22, 0xde, 0x9a, 0xda, 0x17, 0xa1, 0xd0, 0xb0, 0x91, 0x42, 0x7b, 0x59, - 0x26, 0xbb, 0xff, 0x6c, 0x06, 0xb3, 0x33, 0xdb, 0x99, 0x49, 0x24, 0xc7, 0x7e, 0x83, 0x7e, 0x83, - 0x5e, 0x7b, 0xf4, 0x63, 0x78, 0xf4, 0x58, 0x7a, 0x90, 0xa2, 0x87, 0xde, 0xfb, 0x09, 0x4a, 0x66, - 0x36, 0x36, 0x5b, 0x7b, 0x49, 0x66, 0x7f, 0x6f, 0xff, 0x17, 0x86, 0x41, 0xb5, 0x94, 0x84, 0x17, - 0xa0, 0x7a, 0x5c, 0x5c, 0x12, 0x11, 0x79, 0xa3, 0x7d, 0x2f, 0x06, 0x06, 0x92, 0x4a, 0x37, 0x15, - 0x5c, 0x71, 0xbc, 0x96, 0xe3, 0xdd, 0xd1, 0xfe, 0xd6, 0x46, 0xcc, 0x63, 0xae, 0x49, 0x6f, 0x72, - 0x32, 0xba, 0xad, 0x75, 0x92, 0x50, 0xc6, 0x3d, 0xfd, 0x6b, 0xa0, 0xc6, 0x55, 0x11, 0x55, 0x5f, - 0x9a, 0xb0, 0x8e, 0x22, 0x0a, 0xf0, 0x11, 0x2a, 0xa7, 0x44, 0x90, 0x44, 0xda, 0x96, 0x63, 0x35, - 0x2b, 0x07, 0xb6, 0xfb, 0x67, 0xb8, 0xdb, 0xd6, 0x7c, 0xab, 0x74, 0x7d, 0x5b, 0x2f, 0xf8, 0x99, - 0x1a, 0x7f, 0xb4, 0xd0, 0x3a, 0x65, 0x41, 0x6f, 0x40, 0xe3, 0xbe, 0x0a, 0x8c, 0x47, 0xda, 0x45, - 0x67, 0xae, 0x59, 0x39, 0x38, 0x7c, 0x9c, 0x31, 0x5b, 0xd3, 0x3d, 0x63, 0x2f, 0xb4, 0xad, 0x6d, - 0x5c, 0xcf, 0x99, 0x12, 0xe3, 0x96, 0x33, 0x89, 0xff, 0x79, 0x5b, 0xb7, 0xc7, 0x24, 0x19, 0x9c, - 0x34, 0x1e, 0x65, 0x37, 0xfc, 0x55, 0x9a, 0xf7, 0x6d, 0x45, 0x68, 0xe3, 0x6f, 0x51, 0x78, 0x0d, - 0xcd, 0x5d, 0xc0, 0x58, 0x0f, 0xb4, 0xe4, 0x4f, 0x8e, 0xf8, 0x08, 0xcd, 0x8f, 0xc8, 0x60, 0x08, - 0x76, 0x51, 0x0f, 0xe9, 0x3c, 0x6e, 0x30, 0x1f, 0xe4, 0x1b, 0xf9, 0x49, 0xf1, 0xd8, 0x6a, 0xbc, - 0x43, 0x65, 0xb3, 0x01, 0xfc, 0x06, 0xad, 0xf4, 0x00, 0x82, 0x14, 0x44, 0x08, 0x4c, 0x91, 0x18, - 0x4c, 0x89, 0x56, 0x73, 0xd2, 0xfa, 0xb7, 0xdb, 0xfa, 0xff, 0x21, 0x97, 0x09, 0x97, 0x32, 0xba, - 0x70, 0x29, 0xf7, 0x12, 0xa2, 0xfa, 0xee, 0x6b, 0x88, 0x49, 0x38, 0x3e, 0x85, 0xf0, 0xcb, 0x8f, - 0xab, 0x1d, 0xcb, 0x5f, 0xee, 0x01, 0xb4, 0x1f, 0xec, 0x8d, 0xcf, 0x25, 0xb4, 0x92, 0x2f, 0x8c, - 0x8f, 0xd0, 0x7f, 0x5c, 0xd0, 0x98, 0x32, 0x32, 0x08, 0x24, 0xb0, 0x08, 0x44, 0x40, 0xa2, 0x48, - 0x80, 0x94, 0xd9, 0x3c, 0x9b, 0x53, 0xba, 0xa3, 0xd9, 0xa7, 0x86, 0xc4, 0x3b, 0x68, 0x5d, 0x40, - 0x6f, 0xc8, 0xa2, 0x20, 0xec, 0x13, 0xc6, 0x60, 0x10, 0xd0, 0x48, 0x4f, 0xbb, 0xe4, 0xaf, 0x1a, - 0xe2, 0x99, 0xc1, 0xcf, 0x22, 0xbc, 0x8d, 0x56, 0x32, 0x6d, 0xca, 0x85, 0x9a, 0x08, 0xe7, 0xb4, - 0xb0, 0x6a, 0xd0, 0x36, 0x17, 0xea, 0x2c, 0xc2, 0xfb, 0x68, 0xd3, 0x6c, 0x29, 0x90, 0x22, 0x9c, - 0x4d, 0x2d, 0x69, 0x31, 0x36, 0x64, 0x47, 0x84, 0xbf, 0x83, 0x77, 0x11, 0x9e, 0xb1, 0x4c, 0xc3, - 0xe7, 0x4d, 0x17, 0x0f, 0xfa, 0x2c, 0xff, 0x18, 0xd9, 0x99, 0x58, 0xd1, 0x04, 0xf8, 0xd0, 0xfc, - 0x4b, 0x45, 0x92, 0xd4, 0x2e, 0x3b, 0x56, 0xb3, 0xe4, 0xff, 0x6b, 0xf8, 0x73, 0x43, 0x9f, 0x4f, - 0x59, 0x7c, 0xf0, 0xd0, 0xd9, 0xd4, 0xd9, 0x87, 0xc9, 0x0a, 0xed, 0x05, 0x5d, 0xe9, 0x9f, 0x9c, - 0xed, 0x95, 0xa6, 0x70, 0x1d, 0x55, 0x32, 0x4f, 0x44, 0x14, 0xb1, 0x17, 0x1d, 0xab, 0x59, 0xf5, - 0x91, 0x81, 0x4e, 0x89, 0x22, 0xf8, 0x09, 0xca, 0xf6, 0x14, 0x48, 0xf8, 0x30, 0x04, 0x16, 0x82, - 0xbd, 0xa4, 0xbb, 0xc8, 0x76, 0xd5, 0xc9, 0x50, 0xbc, 0x3b, 0xd9, 0xb4, 0x12, 0x14, 0x64, 0x20, - 0x20, 0x21, 0x94, 0x51, 0x16, 0xdb, 0xc8, 0xb1, 0x9a, 0xf3, 0xfe, 0x5a, 0x46, 0xf8, 0x53, 0x1c, - 0xdb, 0x68, 0x21, 0xeb, 0xd1, 0xae, 0xe8, 0xb4, 0xe9, 0x27, 0xde, 0x46, 0xcb, 0x8c, 0x33, 0x93, - 0x4d, 0xba, 0x03, 0xb0, 0xab, 0x8e, 0xd5, 0x5c, 0xf4, 0xf3, 0x60, 0x2b, 0xbd, 0xbe, 0xab, 0x59, - 0x37, 0x77, 0x35, 0xeb, 0xfb, 0x5d, 0xcd, 0xfa, 0x74, 0x5f, 0x2b, 0xdc, 0xdc, 0xd7, 0x0a, 0x5f, - 0xef, 0x6b, 0x85, 0xf7, 0x6f, 0x63, 0xaa, 0xfa, 0xc3, 0xae, 0x1b, 0xf2, 0xc4, 0x33, 0xf7, 0xce, - 0xa3, 0xdd, 0x70, 0x8f, 0xa4, 0xa9, 0xf4, 0x12, 0x1a, 0x45, 0x03, 0xb8, 0x24, 0x02, 0x3c, 0x33, - 0xe1, 0x5e, 0x76, 0xd3, 0xf7, 0x66, 0x98, 0xd1, 0xb1, 0x97, 0x7f, 0x67, 0xd4, 0x38, 0x05, 0xd9, - 0x2d, 0xeb, 0x87, 0xe2, 0xf0, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0xde, 0x27, 0xed, 0x85, - 0x04, 0x00, 0x00, + // 574 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0xcb, 0x4e, 0xdc, 0x3e, + 0x14, 0xc6, 0xc7, 0xdc, 0xf1, 0xcc, 0x9f, 0x8b, 0xff, 0xd0, 0x5a, 0x2c, 0x42, 0x34, 0x42, 0x6a, + 0x54, 0x44, 0x22, 0x40, 0x42, 0x88, 0x5d, 0xe9, 0x95, 0x1d, 0xca, 0xa0, 0x2e, 0xba, 0x89, 0x3c, + 0xb1, 0xc9, 0x58, 0x24, 0x76, 0x6a, 0x7b, 0x06, 0xcd, 0xb2, 0x6f, 0xd0, 0x37, 0xe8, 0xeb, 0xb0, + 0x64, 0xd9, 0x15, 0xaa, 0xe0, 0x0d, 0xba, 0xea, 0xb2, 0x1a, 0x3b, 0xa1, 0x93, 0xd2, 0x4d, 0xe2, + 0x9c, 0xdf, 0xf7, 0x7d, 0x3e, 0x3e, 0x8a, 0xa1, 0x57, 0x92, 0xf4, 0x8a, 0x99, 0x4b, 0xa9, 0xae, + 0x89, 0xa2, 0xd1, 0x68, 0x3f, 0xca, 0x98, 0x60, 0x9a, 0xeb, 0xb0, 0x54, 0xd2, 0x48, 0xb4, 0xd6, + 0xe0, 0xe1, 0x68, 0x7f, 0x6b, 0x23, 0x93, 0x99, 0xb4, 0x30, 0x9a, 0xac, 0x9c, 0x6e, 0x6b, 0x9d, + 0x14, 0x5c, 0xc8, 0xc8, 0x3e, 0x5d, 0xa9, 0xfb, 0x0b, 0xc0, 0xce, 0x7b, 0x17, 0xd6, 0x33, 0xc4, + 0x30, 0xf4, 0x05, 0xc0, 0x75, 0x2e, 0x92, 0xcb, 0x9c, 0x67, 0x03, 0x93, 0xb8, 0x60, 0x8d, 0x67, + 0xfc, 0xd9, 0xa0, 0x7d, 0x70, 0x18, 0xfe, 0xbd, 0x51, 0x38, 0xed, 0x0d, 0xcf, 0xc4, 0x3b, 0x6b, + 0x3b, 0x77, 0xae, 0xb7, 0xc2, 0xa8, 0xf1, 0xa9, 0x7f, 0x73, 0xb7, 0xdd, 0xfa, 0x79, 0xb7, 0x8d, + 0xc7, 0xa4, 0xc8, 0x4f, 0xba, 0x4f, 0xb2, 0xbb, 0xf1, 0x2a, 0x6f, 0xfa, 0xb6, 0x28, 0xdc, 0xf8, + 0x57, 0x14, 0x5a, 0x83, 0xb3, 0x57, 0x6c, 0x8c, 0x81, 0x0f, 0x82, 0xe5, 0x78, 0xb2, 0x44, 0x47, + 0x70, 0x7e, 0x44, 0xf2, 0x21, 0xc3, 0x33, 0x3e, 0x08, 0xda, 0x07, 0xfe, 0xd3, 0x06, 0x9b, 0x41, + 0xb1, 0x93, 0x9f, 0xcc, 0x1c, 0x83, 0xee, 0xb7, 0x39, 0xb8, 0xd2, 0xa4, 0xe8, 0x08, 0x3e, 0x97, + 0x8a, 0x67, 0x5c, 0x90, 0x3c, 0xd1, 0x4c, 0x50, 0xa6, 0x12, 0x42, 0xa9, 0x62, 0x5a, 0x57, 0x9b, + 0x6e, 0xd6, 0xb8, 0x67, 0xe9, 0x2b, 0x07, 0xd1, 0x4b, 0xb8, 0xae, 0xd8, 0xe5, 0x50, 0xd0, 0x24, + 0x1d, 0x10, 0x21, 0x58, 0x9e, 0x70, 0x6a, 0x5b, 0x5a, 0x8e, 0x57, 0x1d, 0x78, 0xed, 0xea, 0x67, + 0x14, 0xed, 0xc0, 0x95, 0x4a, 0x5b, 0x4a, 0x65, 0x26, 0xc2, 0x59, 0x2b, 0xec, 0xb8, 0xea, 0xb9, + 0x54, 0xe6, 0x8c, 0xa2, 0x7d, 0xb8, 0xe9, 0x8e, 0x92, 0x68, 0x95, 0x4e, 0xa7, 0xce, 0x59, 0x31, + 0x72, 0xb0, 0xa7, 0xd2, 0x3f, 0xc1, 0xbb, 0x10, 0x4d, 0x59, 0xea, 0xf0, 0x79, 0xd7, 0xc5, 0xa3, + 0xbe, 0xca, 0x3f, 0x86, 0xb8, 0x12, 0x1b, 0x5e, 0x30, 0x39, 0x74, 0x6f, 0x6d, 0x48, 0x51, 0xe2, + 0x05, 0x1f, 0x04, 0x73, 0xf1, 0x33, 0xc7, 0x2f, 0x1c, 0xbe, 0xa8, 0x29, 0x3a, 0x78, 0xec, 0xac, + 0x76, 0x0e, 0xd8, 0x64, 0x84, 0x78, 0xd1, 0xee, 0xf4, 0x7f, 0xc3, 0xf6, 0xc1, 0x22, 0xb4, 0x0d, + 0xdb, 0x95, 0x87, 0x12, 0x43, 0xf0, 0x92, 0x0f, 0x82, 0x4e, 0x0c, 0x5d, 0xe9, 0x0d, 0x31, 0x04, + 0xbd, 0x80, 0xd5, 0x9c, 0x12, 0xcd, 0x3e, 0x0f, 0x99, 0x48, 0x19, 0x5e, 0xb6, 0x5d, 0x54, 0xb3, + 0xea, 0x55, 0x55, 0xb4, 0x3b, 0x99, 0xb4, 0x51, 0x9c, 0xe9, 0x44, 0xb1, 0x82, 0x70, 0xc1, 0x45, + 0x86, 0xa1, 0x0f, 0x82, 0xf9, 0x78, 0xad, 0x02, 0x71, 0x5d, 0x47, 0x18, 0x2e, 0x56, 0x3d, 0xe2, + 0xb6, 0x4d, 0xab, 0x3f, 0xd1, 0x0e, 0xfc, 0x4f, 0x48, 0xe1, 0xb2, 0x49, 0x3f, 0x67, 0xb8, 0xe3, + 0x83, 0x60, 0x29, 0x6e, 0x16, 0x4f, 0xcb, 0x9b, 0x7b, 0x0f, 0xdc, 0xde, 0x7b, 0xe0, 0xc7, 0xbd, + 0x07, 0xbe, 0x3e, 0x78, 0xad, 0xdb, 0x07, 0xaf, 0xf5, 0xfd, 0xc1, 0x6b, 0x7d, 0xfa, 0x98, 0x71, + 0x33, 0x18, 0xf6, 0xc3, 0x54, 0x16, 0x51, 0x2a, 0x75, 0x21, 0x75, 0xc4, 0xfb, 0xe9, 0x1e, 0x29, + 0x4b, 0x1d, 0x15, 0x9c, 0xd2, 0x9c, 0x5d, 0x13, 0xc5, 0x22, 0x77, 0xc2, 0xbd, 0xea, 0x77, 0xdc, + 0x9b, 0x22, 0xa3, 0xe3, 0xa8, 0x79, 0xa9, 0xcd, 0xb8, 0x64, 0xba, 0xbf, 0x60, 0x6f, 0xe5, 0xe1, + 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x8e, 0x69, 0x25, 0xf2, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -353,49 +299,6 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil -} - -func (m *Params) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Params) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size := m.FeePercentage.Size() - i -= size - if _, err := m.FeePercentage.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -518,8 +421,6 @@ func (m *GenesisState) Size() (n int) { } var l int _ = l - l = m.Params.Size() - n += 1 + l + sovGenesis(uint64(l)) if len(m.InFlightPackets) > 0 { for k, v := range m.InFlightPackets { _ = k @@ -532,17 +433,6 @@ func (m *GenesisState) Size() (n int) { return n } -func (m *Params) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.FeePercentage.Size() - n += 1 + l + sovGenesis(uint64(l)) - return n -} - func (m *InFlightPacket) Size() (n int) { if m == nil { return 0 @@ -630,39 +520,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field InFlightPackets", wireType) @@ -813,90 +670,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } -func (m *Params) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Params: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FeePercentage", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.FeePercentage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenesis(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenesis - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *InFlightPacket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/middleware/packet-forward-middleware/packetforward/types/keys.go b/middleware/packet-forward-middleware/packetforward/types/keys.go index 5c64c20a..13479e9a 100644 --- a/middleware/packet-forward-middleware/packetforward/types/keys.go +++ b/middleware/packet-forward-middleware/packetforward/types/keys.go @@ -1,6 +1,6 @@ package types -import fmt "fmt" +import "fmt" const ( // ModuleName defines the module name @@ -9,9 +9,6 @@ const ( // StoreKey is the store key string for IBC transfer StoreKey = ModuleName - // RouterKey is the message route for IBC transfer - RouterKey = ModuleName - // QuerierRoute is the querier route for IBC transfer QuerierRoute = ModuleName ) diff --git a/middleware/packet-forward-middleware/packetforward/types/msgs.go b/middleware/packet-forward-middleware/packetforward/types/msgs.go deleted file mode 100644 index e0ce8a24..00000000 --- a/middleware/packet-forward-middleware/packetforward/types/msgs.go +++ /dev/null @@ -1,29 +0,0 @@ -package types - -import ( - "cosmossdk.io/errors" - - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var _ sdk.Msg = &MsgUpdateParams{} - -// GetSignBytes implements the LegacyMsg interface. -func (m MsgUpdateParams) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) -} - -// GetSigners returns the expected signers for a MsgUpdateParams message. -func (m *MsgUpdateParams) GetSigners() []sdk.AccAddress { - addr, _ := sdk.AccAddressFromBech32(m.Authority) - return []sdk.AccAddress{addr} -} - -// ValidateBasic does a sanity check on the provided data. -func (m *MsgUpdateParams) ValidateBasic() error { - if _, err := sdk.AccAddressFromBech32(m.Authority); err != nil { - return errors.Wrap(err, "invalid authority address") - } - - return m.Params.Validate() -} diff --git a/middleware/packet-forward-middleware/packetforward/types/params.go b/middleware/packet-forward-middleware/packetforward/types/params.go deleted file mode 100644 index 352c703c..00000000 --- a/middleware/packet-forward-middleware/packetforward/types/params.go +++ /dev/null @@ -1,43 +0,0 @@ -package types - -import ( - "fmt" - - sdkmath "cosmossdk.io/math" -) - -// DefaultFeePercentage is the default value used to extract a fee from all forwarded packets. -var DefaultFeePercentage = sdkmath.LegacyNewDec(0) - -// NewParams creates a new parameter configuration for the pfm module. -func NewParams(feePercentage sdkmath.LegacyDec) Params { - return Params{ - FeePercentage: feePercentage, - } -} - -// DefaultParams is the default parameter configuration for the pfm module. -func DefaultParams() Params { - return NewParams(DefaultFeePercentage) -} - -// Validate the pfm module parameters. -func (p Params) Validate() error { - return validateFeePercentage(p.FeePercentage) -} - -// validateFeePercentage asserts that the fee percentage param is a valid sdk.Dec type. -func validateFeePercentage(i interface{}) error { - v, ok := i.(sdkmath.LegacyDec) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - if v.IsNegative() { - return fmt.Errorf("invalid fee percentage. expected not negative, got %d", v.RoundInt64()) - } - if !(v.LTE(sdkmath.LegacyOneDec())) { - return fmt.Errorf("invalid fee percentage. expected less than one 1 got %d", v.RoundInt64()) - } - - return nil -} diff --git a/middleware/packet-forward-middleware/packetforward/types/params_legacy.go b/middleware/packet-forward-middleware/packetforward/types/params_legacy.go deleted file mode 100644 index 6390180c..00000000 --- a/middleware/packet-forward-middleware/packetforward/types/params_legacy.go +++ /dev/null @@ -1,25 +0,0 @@ -/* -NOTE: Usage of x/params to manage parameters is deprecated in favor of x/gov -controlled execution of MsgUpdateParams messages. These types remains solely -for migration purposes and will be removed in a future release. -*/ -package types - -import ( - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" -) - -// KeyFeePercentage is store's key for FeePercentage Params -var KeyFeePercentage = []byte("FeePercentage") - -// ParamKeyTable type declaration for parameters. -func ParamKeyTable() paramtypes.KeyTable { - return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) -} - -// ParamSetPairs implements params.ParamSet. -func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { - return paramtypes.ParamSetPairs{ - paramtypes.NewParamSetPair(KeyFeePercentage, &p.FeePercentage, validateFeePercentage), - } -} diff --git a/middleware/packet-forward-middleware/packetforward/types/query.pb.go b/middleware/packet-forward-middleware/packetforward/types/query.pb.go deleted file mode 100644 index 13ff4b48..00000000 --- a/middleware/packet-forward-middleware/packetforward/types/query.pb.go +++ /dev/null @@ -1,542 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: packetforward/v1/query.proto - -package types - -import ( - context "context" - fmt "fmt" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" - _ "google.golang.org/genproto/googleapis/api/annotations" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// QueryParamsRequest is the request type for the Query/Params RPC method. -type QueryParamsRequest struct { -} - -func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } -func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryParamsRequest) ProtoMessage() {} -func (*QueryParamsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_358c54bd2cc154d0, []int{0} -} -func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsRequest.Merge(m, src) -} -func (m *QueryParamsRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo - -// QueryParamsResponse is the response type for the Query/Params RPC method. -type QueryParamsResponse struct { - // params defines the parameters of the module. - Params *Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"` -} - -func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } -func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) } -func (*QueryParamsResponse) ProtoMessage() {} -func (*QueryParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_358c54bd2cc154d0, []int{1} -} -func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsResponse.Merge(m, src) -} -func (m *QueryParamsResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryParamsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo - -func (m *QueryParamsResponse) GetParams() *Params { - if m != nil { - return m.Params - } - return nil -} - -func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "packetforward.v1.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "packetforward.v1.QueryParamsResponse") -} - -func init() { proto.RegisterFile("packetforward/v1/query.proto", fileDescriptor_358c54bd2cc154d0) } - -var fileDescriptor_358c54bd2cc154d0 = []byte{ - // 290 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xb1, 0x4e, 0xc3, 0x30, - 0x10, 0x86, 0x63, 0x24, 0x32, 0x98, 0x05, 0x19, 0x86, 0x2a, 0xaa, 0x2c, 0x08, 0x20, 0xc1, 0x90, - 0x98, 0x96, 0x85, 0x99, 0x85, 0x15, 0x18, 0x18, 0xd8, 0x9c, 0xc4, 0x04, 0x8b, 0x26, 0xe7, 0xda, - 0x4e, 0xaa, 0x6e, 0x88, 0x91, 0x09, 0x89, 0x97, 0x62, 0xac, 0xc4, 0xc2, 0x88, 0x12, 0x1e, 0x04, - 0x35, 0xc9, 0x40, 0x9b, 0xa1, 0xeb, 0xfd, 0xff, 0x7d, 0xfe, 0x7c, 0x78, 0xa8, 0x78, 0xfc, 0x2c, - 0xec, 0x23, 0xe8, 0x19, 0xd7, 0x09, 0x2b, 0x47, 0x6c, 0x5a, 0x08, 0x3d, 0x0f, 0x95, 0x06, 0x0b, - 0x64, 0x77, 0x25, 0x0d, 0xcb, 0x91, 0x37, 0x4c, 0x01, 0xd2, 0x89, 0x60, 0x5c, 0x49, 0xc6, 0xf3, - 0x1c, 0x2c, 0xb7, 0x12, 0x72, 0xd3, 0xf6, 0x3d, 0xda, 0xa3, 0xa5, 0x22, 0x17, 0x46, 0x76, 0xb9, - 0xbf, 0x8f, 0xc9, 0xed, 0x12, 0x7f, 0xc3, 0x35, 0xcf, 0xcc, 0x9d, 0x98, 0x16, 0xc2, 0x58, 0xff, - 0x1a, 0xef, 0xad, 0x4c, 0x8d, 0x82, 0xdc, 0x08, 0x72, 0x8e, 0x5d, 0xd5, 0x4c, 0x06, 0xe8, 0x00, - 0x9d, 0xee, 0x8c, 0x07, 0xe1, 0xba, 0x4d, 0xd8, 0x6d, 0x74, 0xbd, 0xf1, 0x1b, 0xc2, 0xdb, 0x0d, - 0x89, 0xbc, 0x20, 0xec, 0xb6, 0x21, 0x39, 0xee, 0xaf, 0xf5, 0x1d, 0xbc, 0x93, 0x0d, 0xad, 0xd6, - 0xc9, 0x3f, 0x7b, 0xfd, 0xfa, 0xfd, 0xd8, 0x3a, 0x22, 0x87, 0x4c, 0x46, 0x31, 0xe3, 0x4a, 0x19, - 0xd6, 0xfb, 0x72, 0x2b, 0x73, 0xa5, 0x3e, 0x2b, 0x8a, 0x16, 0x15, 0x45, 0x3f, 0x15, 0x45, 0xef, - 0x35, 0x75, 0x16, 0x35, 0x75, 0xbe, 0x6b, 0xea, 0x3c, 0xdc, 0xa7, 0xd2, 0x3e, 0x15, 0x51, 0x18, - 0x43, 0xc6, 0x62, 0x30, 0x19, 0x98, 0x25, 0x2d, 0x68, 0x68, 0x99, 0x4c, 0x92, 0x89, 0x98, 0x71, - 0x2d, 0x3a, 0x70, 0xd0, 0x91, 0x83, 0x7f, 0x49, 0x79, 0xb9, 0xf6, 0xaa, 0x9d, 0x2b, 0x61, 0x22, - 0xb7, 0x39, 0xf2, 0xc5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x9e, 0x5c, 0xe3, 0xd4, 0x01, - 0x00, 0x00, -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 - -// QueryClient is the client API for Query service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type QueryClient interface { - // Params queries all parameters of the packetforward module. - Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) -} - -type queryClient struct { - cc grpc1.ClientConn -} - -func NewQueryClient(cc grpc1.ClientConn) QueryClient { - return &queryClient{cc} -} - -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { - out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/packetforward.v1.Query/Params", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// QueryServer is the server API for Query service. -type QueryServer interface { - // Params queries all parameters of the packetforward module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) -} - -// UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct { -} - -func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") -} - -func RegisterQueryServer(s grpc1.Server, srv QueryServer) { - s.RegisterService(&_Query_serviceDesc, srv) -} - -func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).Params(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/packetforward.v1.Query/Params", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "packetforward.v1.Query", - HandlerType: (*QueryServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Params", - Handler: _Query_Params_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "packetforward/v1/query.proto", -} - -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *QueryParamsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Params != nil { - { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { - offset -= sovQuery(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *QueryParamsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *QueryParamsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Params != nil { - l = m.Params.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func sovQuery(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozQuery(x uint64) (n int) { - return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Params == nil { - m.Params = &Params{} - } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipQuery(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowQuery - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowQuery - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowQuery - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthQuery - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupQuery - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthQuery - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthQuery = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowQuery = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupQuery = fmt.Errorf("proto: unexpected end of group") -) diff --git a/middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go b/middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go deleted file mode 100644 index d624d470..00000000 --- a/middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go +++ /dev/null @@ -1,153 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: packetforward/v1/query.proto - -/* -Package types is a reverse proxy. - -It translates gRPC into RESTful JSON APIs. -*/ -package types - -import ( - "context" - "io" - "net/http" - - "github.com/golang/protobuf/descriptor" - "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/metadata" - "google.golang.org/grpc/status" -) - -// Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = descriptor.ForMessage -var _ = metadata.Join - -func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest - var metadata runtime.ServerMetadata - - msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest - var metadata runtime.ServerMetadata - - msg, err := server.Params(ctx, &protoReq) - return msg, metadata, err - -} - -// RegisterQueryHandlerServer registers the http handlers for service Query to "mux". -// UnaryRPC :call QueryServer directly. -// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. -// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. -func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { - - mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_Params_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -// RegisterQueryHandlerFromEndpoint is same as RegisterQueryHandler but -// automatically dials to "endpoint" and closes the connection when "ctx" gets done. -func RegisterQueryHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) - if err != nil { - return err - } - defer func() { - if err != nil { - if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) - } - return - } - go func() { - <-ctx.Done() - if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) - } - }() - }() - - return RegisterQueryHandler(ctx, mux, conn) -} - -// RegisterQueryHandler registers the http handlers for service Query to "mux". -// The handlers forward requests to the grpc endpoint over "conn". -func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { - return RegisterQueryHandlerClient(ctx, mux, NewQueryClient(conn)) -} - -// RegisterQueryHandlerClient registers the http handlers for service Query -// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "QueryClient". -// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "QueryClient" -// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "QueryClient" to call the correct interceptors. -func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { - - mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Query_Params_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "apps", "packetforward", "v1", "params"}, "", runtime.AssumeColonVerbOpt(false))) -) - -var ( - forward_Query_Params_0 = runtime.ForwardResponseMessage -) diff --git a/middleware/packet-forward-middleware/packetforward/types/tx.pb.go b/middleware/packet-forward-middleware/packetforward/types/tx.pb.go deleted file mode 100644 index a6ee4916..00000000 --- a/middleware/packet-forward-middleware/packetforward/types/tx.pb.go +++ /dev/null @@ -1,605 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: packetforward/v1/tx.proto - -package types - -import ( - context "context" - fmt "fmt" - _ "github.com/cosmos/cosmos-proto" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// MsgUpdateParams is the Msg/UpdateParams request type. -// -// Since: cosmos-sdk 0.47 -type MsgUpdateParams struct { - // authority is the address of the governance account. - Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` - // params defines the x/packetforward parameters to update. - // - // NOTE: All parameters must be supplied. - Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` -} - -func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } -func (m *MsgUpdateParams) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateParams) ProtoMessage() {} -func (*MsgUpdateParams) Descriptor() ([]byte, []int) { - return fileDescriptor_6309e74559641db6, []int{0} -} -func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUpdateParams.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MsgUpdateParams) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateParams.Merge(m, src) -} -func (m *MsgUpdateParams) XXX_Size() int { - return m.Size() -} -func (m *MsgUpdateParams) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateParams.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo - -func (m *MsgUpdateParams) GetAuthority() string { - if m != nil { - return m.Authority - } - return "" -} - -func (m *MsgUpdateParams) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - -// MsgUpdateParamsResponse defines the response structure for executing a -// MsgUpdateParams message. -// -// Since: cosmos-sdk 0.47 -type MsgUpdateParamsResponse struct { -} - -func (m *MsgUpdateParamsResponse) Reset() { *m = MsgUpdateParamsResponse{} } -func (m *MsgUpdateParamsResponse) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateParamsResponse) ProtoMessage() {} -func (*MsgUpdateParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6309e74559641db6, []int{1} -} -func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUpdateParamsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src) -} -func (m *MsgUpdateParamsResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateParamsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*MsgUpdateParams)(nil), "packetforward.v1.MsgUpdateParams") - proto.RegisterType((*MsgUpdateParamsResponse)(nil), "packetforward.v1.MsgUpdateParamsResponse") -} - -func init() { proto.RegisterFile("packetforward/v1/tx.proto", fileDescriptor_6309e74559641db6) } - -var fileDescriptor_6309e74559641db6 = []byte{ - // 348 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x48, 0x4c, 0xce, - 0x4e, 0x2d, 0x49, 0xcb, 0x2f, 0x2a, 0x4f, 0x2c, 0x4a, 0xd1, 0x2f, 0x33, 0xd4, 0x2f, 0xa9, 0xd0, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0x91, 0xd2, 0x2b, 0x33, 0x94, 0x12, 0x4f, 0xce, - 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0xcf, 0x2d, 0x4e, 0x07, 0xa9, 0xcc, 0x2d, 0x4e, 0x87, 0x28, 0x95, - 0x92, 0xc3, 0x30, 0x25, 0x3d, 0x35, 0x2f, 0xb5, 0x38, 0xb3, 0x18, 0x2a, 0x2f, 0x92, 0x9e, 0x9f, - 0x9e, 0x0f, 0x66, 0xea, 0x83, 0x58, 0x50, 0x51, 0x49, 0x88, 0x71, 0xf1, 0x10, 0x09, 0x08, 0x07, - 0x22, 0xa5, 0x34, 0x91, 0x91, 0x8b, 0xdf, 0xb7, 0x38, 0x3d, 0xb4, 0x20, 0x25, 0xb1, 0x24, 0x35, - 0x20, 0xb1, 0x28, 0x31, 0xb7, 0x58, 0xc8, 0x8c, 0x8b, 0x33, 0xb1, 0xb4, 0x24, 0x23, 0xbf, 0x28, - 0xb3, 0xa4, 0x52, 0x82, 0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xe2, 0xd2, 0x16, 0x5d, 0x11, 0xa8, - 0x46, 0xc7, 0x94, 0x94, 0xa2, 0xd4, 0xe2, 0xe2, 0xe0, 0x92, 0xa2, 0xcc, 0xbc, 0xf4, 0x20, 0x84, - 0x52, 0x21, 0x33, 0x2e, 0xb6, 0x02, 0xb0, 0x09, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x12, - 0x7a, 0xe8, 0x1e, 0xd3, 0x83, 0xd8, 0xe0, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x54, 0xb5, - 0x15, 0x5f, 0xd3, 0xf3, 0x0d, 0x5a, 0x08, 0x73, 0x94, 0x24, 0xb9, 0xc4, 0xd1, 0x9c, 0x14, 0x94, - 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x6a, 0x94, 0xc5, 0xc5, 0xec, 0x5b, 0x9c, 0x2e, 0x14, 0xc3, - 0xc5, 0x83, 0xe2, 0x62, 0x45, 0x4c, 0x9b, 0xd0, 0x4c, 0x90, 0xd2, 0x24, 0xa8, 0x04, 0x66, 0x89, - 0x14, 0x6b, 0xc3, 0xf3, 0x0d, 0x5a, 0x8c, 0x4e, 0x05, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, - 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, - 0x2c, 0xc7, 0x10, 0x15, 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x0d, - 0x4d, 0xfd, 0xcc, 0xa4, 0x64, 0xdd, 0xc4, 0x82, 0x82, 0x62, 0xfd, 0xdc, 0xcc, 0x94, 0x94, 0x9c, - 0xd4, 0xf2, 0xc4, 0xa2, 0x54, 0x7d, 0x88, 0x85, 0xba, 0x50, 0x1b, 0x75, 0x91, 0x64, 0xca, 0x2c, - 0xf4, 0x51, 0x23, 0xb2, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x27, 0xc6, 0x80, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x1d, 0xe1, 0xb6, 0xe4, 0x2c, 0x02, 0x00, 0x00, -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 - -// MsgClient is the client API for Msg service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type MsgClient interface { - // UpdateParams defines a governance operation for updating the x/packetforward module - // parameters. The authority is hard-coded to the x/gov module account. - // - // Since: cosmos-sdk 0.47 - UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) -} - -type msgClient struct { - cc grpc1.ClientConn -} - -func NewMsgClient(cc grpc1.ClientConn) MsgClient { - return &msgClient{cc} -} - -func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { - out := new(MsgUpdateParamsResponse) - err := c.cc.Invoke(ctx, "/packetforward.v1.Msg/UpdateParams", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// MsgServer is the server API for Msg service. -type MsgServer interface { - // UpdateParams defines a governance operation for updating the x/packetforward module - // parameters. The authority is hard-coded to the x/gov module account. - // - // Since: cosmos-sdk 0.47 - UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) -} - -// UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct { -} - -func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") -} - -func RegisterMsgServer(s grpc1.Server, srv MsgServer) { - s.RegisterService(&_Msg_serviceDesc, srv) -} - -func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateParams) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).UpdateParams(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/packetforward.v1.Msg/UpdateParams", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) - } - return interceptor(ctx, in, info, handler) -} - -var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "packetforward.v1.Msg", - HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "UpdateParams", - Handler: _Msg_UpdateParams_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "packetforward/v1/tx.proto", -} - -func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MsgUpdateParams) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUpdateParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - if len(m.Authority) > 0 { - i -= len(m.Authority) - copy(dAtA[i:], m.Authority) - i = encodeVarintTx(dAtA, i, uint64(len(m.Authority))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgUpdateParamsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MsgUpdateParamsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUpdateParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func encodeVarintTx(dAtA []byte, offset int, v uint64) int { - offset -= sovTx(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *MsgUpdateParams) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Authority) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = m.Params.Size() - n += 1 + l + sovTx(uint64(l)) - return n -} - -func (m *MsgUpdateParamsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func sovTx(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozTx(x uint64) (n int) { - return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateParams: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateParams: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Authority", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Authority = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgUpdateParamsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateParamsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipTx(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTx - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTx - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTx - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthTx - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTx - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthTx - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthTx = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTx = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupTx = fmt.Errorf("proto: unexpected end of group") -) diff --git a/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto b/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto index 856703b3..e9a1361c 100644 --- a/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto +++ b/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto @@ -8,8 +8,6 @@ option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middle // GenesisState defines the packetforward genesis state message GenesisState { - Params params = 1 [(gogoproto.nullable) = false]; - // key - information about forwarded packet: src_channel // (parsedReceiver.Channel), src_port (parsedReceiver.Port), sequence value - // information about original packet for refunding if necessary: retries, @@ -20,15 +18,6 @@ message GenesisState { ]; } -// Params defines the set of packetforward parameters. -message Params { - string fee_percentage = 1 [ - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", - (gogoproto.nullable) = false, - (amino.dont_omitempty) = true - ]; -} - // InFlightPacket contains information about original packet for // writing the acknowledgement and refunding if necessary. message InFlightPacket { diff --git a/middleware/packet-forward-middleware/proto/packetforward/v1/query.proto b/middleware/packet-forward-middleware/proto/packetforward/v1/query.proto deleted file mode 100644 index eb898d56..00000000 --- a/middleware/packet-forward-middleware/proto/packetforward/v1/query.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; -package packetforward.v1; - -import "google/api/annotations.proto"; -import "packetforward/v1/genesis.proto"; - -option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"; - -// Query provides defines the gRPC querier service. -service Query { - // Params queries all parameters of the packetforward module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/ibc/apps/packetforward/v1/params"; - } -} - -// QueryParamsRequest is the request type for the Query/Params RPC method. -message QueryParamsRequest {} - -// QueryParamsResponse is the response type for the Query/Params RPC method. -message QueryParamsResponse { - // params defines the parameters of the module. - Params params = 1; -} diff --git a/middleware/packet-forward-middleware/proto/packetforward/v1/tx.proto b/middleware/packet-forward-middleware/proto/packetforward/v1/tx.proto deleted file mode 100644 index 7209b518..00000000 --- a/middleware/packet-forward-middleware/proto/packetforward/v1/tx.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto3"; -package packetforward.v1; - -import "cosmos/msg/v1/msg.proto"; -import "packetforward/v1/genesis.proto"; -import "gogoproto/gogo.proto"; -import "cosmos_proto/cosmos.proto"; - -option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"; - -// Msg defines the Msg service. -service Msg { - option (cosmos.msg.v1.service) = true; - - // UpdateParams defines a governance operation for updating the x/packetforward module - // parameters. The authority is hard-coded to the x/gov module account. - // - // Since: cosmos-sdk 0.47 - rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); -} - -// MsgUpdateParams is the Msg/UpdateParams request type. -// -// Since: cosmos-sdk 0.47 -message MsgUpdateParams { - option (cosmos.msg.v1.signer) = "authority"; - - // authority is the address of the governance account. - string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - - // params defines the x/packetforward parameters to update. - // - // NOTE: All parameters must be supplied. - Params params = 2 [(gogoproto.nullable) = false]; -} - -// MsgUpdateParamsResponse defines the response structure for executing a -// MsgUpdateParams message. -// -// Since: cosmos-sdk 0.47 -message MsgUpdateParamsResponse {} diff --git a/middleware/packet-forward-middleware/test/mock/bank_keeper.go b/middleware/packet-forward-middleware/test/mock/bank_keeper.go index 9c63f605..a1503e7c 100644 --- a/middleware/packet-forward-middleware/test/mock/bank_keeper.go +++ b/middleware/packet-forward-middleware/test/mock/bank_keeper.go @@ -1,12 +1,17 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types (interfaces: BankKeeper) +// +// Generated by this command: +// +// mockgen -package=mock -destination=./test/mock/bank_keeper.go github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types BankKeeper +// // Package mock is a generated GoMock package. package mock import ( + context "context" reflect "reflect" - "context" types "github.com/cosmos/cosmos-sdk/types" gomock "go.uber.org/mock/gomock" @@ -44,7 +49,7 @@ func (m *MockBankKeeper) BurnCoins(arg0 context.Context, arg1 string, arg2 types } // BurnCoins indicates an expected call of BurnCoins. -func (mr *MockBankKeeperMockRecorder) BurnCoins(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockBankKeeperMockRecorder) BurnCoins(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BurnCoins", reflect.TypeOf((*MockBankKeeper)(nil).BurnCoins), arg0, arg1, arg2) } @@ -58,7 +63,7 @@ func (m *MockBankKeeper) MintCoins(arg0 context.Context, arg1 string, arg2 types } // MintCoins indicates an expected call of MintCoins. -func (mr *MockBankKeeperMockRecorder) MintCoins(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockBankKeeperMockRecorder) MintCoins(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MintCoins", reflect.TypeOf((*MockBankKeeper)(nil).MintCoins), arg0, arg1, arg2) } @@ -72,7 +77,7 @@ func (m *MockBankKeeper) SendCoins(arg0 context.Context, arg1, arg2 types.AccAdd } // SendCoins indicates an expected call of SendCoins. -func (mr *MockBankKeeperMockRecorder) SendCoins(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockBankKeeperMockRecorder) SendCoins(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendCoins", reflect.TypeOf((*MockBankKeeper)(nil).SendCoins), arg0, arg1, arg2, arg3) } @@ -86,7 +91,7 @@ func (m *MockBankKeeper) SendCoinsFromAccountToModule(arg0 context.Context, arg1 } // SendCoinsFromAccountToModule indicates an expected call of SendCoinsFromAccountToModule. -func (mr *MockBankKeeperMockRecorder) SendCoinsFromAccountToModule(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockBankKeeperMockRecorder) SendCoinsFromAccountToModule(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendCoinsFromAccountToModule", reflect.TypeOf((*MockBankKeeper)(nil).SendCoinsFromAccountToModule), arg0, arg1, arg2, arg3) } @@ -100,7 +105,7 @@ func (m *MockBankKeeper) SendCoinsFromModuleToAccount(arg0 context.Context, arg1 } // SendCoinsFromModuleToAccount indicates an expected call of SendCoinsFromModuleToAccount. -func (mr *MockBankKeeperMockRecorder) SendCoinsFromModuleToAccount(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockBankKeeperMockRecorder) SendCoinsFromModuleToAccount(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendCoinsFromModuleToAccount", reflect.TypeOf((*MockBankKeeper)(nil).SendCoinsFromModuleToAccount), arg0, arg1, arg2, arg3) } diff --git a/middleware/packet-forward-middleware/test/mock/channel_keeper.go b/middleware/packet-forward-middleware/test/mock/channel_keeper.go index c9447ae1..53dd9864 100644 --- a/middleware/packet-forward-middleware/test/mock/channel_keeper.go +++ b/middleware/packet-forward-middleware/test/mock/channel_keeper.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types (interfaces: ChannelKeeper) +// +// Generated by this command: +// +// mockgen -package=mock -destination=./test/mock/channel_keeper.go github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types ChannelKeeper +// // Package mock is a generated GoMock package. package mock @@ -46,7 +51,7 @@ func (m *MockChannelKeeper) GetChannel(arg0 types.Context, arg1, arg2 string) (t } // GetChannel indicates an expected call of GetChannel. -func (mr *MockChannelKeeperMockRecorder) GetChannel(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockChannelKeeperMockRecorder) GetChannel(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChannel", reflect.TypeOf((*MockChannelKeeper)(nil).GetChannel), arg0, arg1, arg2) } @@ -61,7 +66,7 @@ func (m *MockChannelKeeper) GetNextSequenceSend(arg0 types.Context, arg1, arg2 s } // GetNextSequenceSend indicates an expected call of GetNextSequenceSend. -func (mr *MockChannelKeeperMockRecorder) GetNextSequenceSend(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockChannelKeeperMockRecorder) GetNextSequenceSend(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNextSequenceSend", reflect.TypeOf((*MockChannelKeeper)(nil).GetNextSequenceSend), arg0, arg1, arg2) } @@ -75,7 +80,7 @@ func (m *MockChannelKeeper) GetPacketCommitment(arg0 types.Context, arg1, arg2 s } // GetPacketCommitment indicates an expected call of GetPacketCommitment. -func (mr *MockChannelKeeperMockRecorder) GetPacketCommitment(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockChannelKeeperMockRecorder) GetPacketCommitment(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPacketCommitment", reflect.TypeOf((*MockChannelKeeper)(nil).GetPacketCommitment), arg0, arg1, arg2, arg3) } @@ -91,7 +96,7 @@ func (m *MockChannelKeeper) LookupModuleByChannel(arg0 types.Context, arg1, arg2 } // LookupModuleByChannel indicates an expected call of LookupModuleByChannel. -func (mr *MockChannelKeeperMockRecorder) LookupModuleByChannel(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockChannelKeeperMockRecorder) LookupModuleByChannel(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LookupModuleByChannel", reflect.TypeOf((*MockChannelKeeper)(nil).LookupModuleByChannel), arg0, arg1, arg2) } diff --git a/middleware/packet-forward-middleware/test/mock/distribution_keeper.go b/middleware/packet-forward-middleware/test/mock/distribution_keeper.go deleted file mode 100644 index b980523e..00000000 --- a/middleware/packet-forward-middleware/test/mock/distribution_keeper.go +++ /dev/null @@ -1,50 +0,0 @@ -// Code generated by MockGen. DO NOT EDIT. -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types (interfaces: DistributionKeeper) - -// Package mock is a generated GoMock package. -package mock - -import ( - reflect "reflect" - "context" - - types "github.com/cosmos/cosmos-sdk/types" - gomock "go.uber.org/mock/gomock" -) - -// MockDistributionKeeper is a mock of DistributionKeeper interface. -type MockDistributionKeeper struct { - ctrl *gomock.Controller - recorder *MockDistributionKeeperMockRecorder -} - -// MockDistributionKeeperMockRecorder is the mock recorder for MockDistributionKeeper. -type MockDistributionKeeperMockRecorder struct { - mock *MockDistributionKeeper -} - -// NewMockDistributionKeeper creates a new mock instance. -func NewMockDistributionKeeper(ctrl *gomock.Controller) *MockDistributionKeeper { - mock := &MockDistributionKeeper{ctrl: ctrl} - mock.recorder = &MockDistributionKeeperMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockDistributionKeeper) EXPECT() *MockDistributionKeeperMockRecorder { - return m.recorder -} - -// FundCommunityPool mocks base method. -func (m *MockDistributionKeeper) FundCommunityPool(arg0 context.Context, arg1 types.Coins, arg2 types.AccAddress) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "FundCommunityPool", arg0, arg1, arg2) - ret0, _ := ret[0].(error) - return ret0 -} - -// FundCommunityPool indicates an expected call of FundCommunityPool. -func (mr *MockDistributionKeeperMockRecorder) FundCommunityPool(arg0, arg1, arg2 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FundCommunityPool", reflect.TypeOf((*MockDistributionKeeper)(nil).FundCommunityPool), arg0, arg1, arg2) -} diff --git a/middleware/packet-forward-middleware/test/mock/ibc_module.go b/middleware/packet-forward-middleware/test/mock/ibc_module.go index d3c156a2..f72b6868 100644 --- a/middleware/packet-forward-middleware/test/mock/ibc_module.go +++ b/middleware/packet-forward-middleware/test/mock/ibc_module.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/cosmos/ibc-go/v8/modules/core/05-port/types (interfaces: IBCModule) +// +// Generated by this command: +// +// mockgen -package=mock -destination=./test/mock/ibc_module.go github.com/cosmos/ibc-go/v8/modules/core/05-port/types IBCModule +// // Package mock is a generated GoMock package. package mock @@ -46,7 +51,7 @@ func (m *MockIBCModule) OnAcknowledgementPacket(arg0 types.Context, arg1 types1. } // OnAcknowledgementPacket indicates an expected call of OnAcknowledgementPacket. -func (mr *MockIBCModuleMockRecorder) OnAcknowledgementPacket(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnAcknowledgementPacket(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnAcknowledgementPacket", reflect.TypeOf((*MockIBCModule)(nil).OnAcknowledgementPacket), arg0, arg1, arg2, arg3) } @@ -60,7 +65,7 @@ func (m *MockIBCModule) OnChanCloseConfirm(arg0 types.Context, arg1, arg2 string } // OnChanCloseConfirm indicates an expected call of OnChanCloseConfirm. -func (mr *MockIBCModuleMockRecorder) OnChanCloseConfirm(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanCloseConfirm(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanCloseConfirm", reflect.TypeOf((*MockIBCModule)(nil).OnChanCloseConfirm), arg0, arg1, arg2) } @@ -74,7 +79,7 @@ func (m *MockIBCModule) OnChanCloseInit(arg0 types.Context, arg1, arg2 string) e } // OnChanCloseInit indicates an expected call of OnChanCloseInit. -func (mr *MockIBCModuleMockRecorder) OnChanCloseInit(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanCloseInit(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanCloseInit", reflect.TypeOf((*MockIBCModule)(nil).OnChanCloseInit), arg0, arg1, arg2) } @@ -88,7 +93,7 @@ func (m *MockIBCModule) OnChanOpenAck(arg0 types.Context, arg1, arg2, arg3, arg4 } // OnChanOpenAck indicates an expected call of OnChanOpenAck. -func (mr *MockIBCModuleMockRecorder) OnChanOpenAck(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenAck(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenAck", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenAck), arg0, arg1, arg2, arg3, arg4) } @@ -102,7 +107,7 @@ func (m *MockIBCModule) OnChanOpenConfirm(arg0 types.Context, arg1, arg2 string) } // OnChanOpenConfirm indicates an expected call of OnChanOpenConfirm. -func (mr *MockIBCModuleMockRecorder) OnChanOpenConfirm(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenConfirm(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenConfirm", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenConfirm), arg0, arg1, arg2) } @@ -117,7 +122,7 @@ func (m *MockIBCModule) OnChanOpenInit(arg0 types.Context, arg1 types1.Order, ar } // OnChanOpenInit indicates an expected call of OnChanOpenInit. -func (mr *MockIBCModuleMockRecorder) OnChanOpenInit(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenInit(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenInit", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenInit), arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) } @@ -132,7 +137,7 @@ func (m *MockIBCModule) OnChanOpenTry(arg0 types.Context, arg1 types1.Order, arg } // OnChanOpenTry indicates an expected call of OnChanOpenTry. -func (mr *MockIBCModuleMockRecorder) OnChanOpenTry(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenTry(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenTry", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenTry), arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) } @@ -146,7 +151,7 @@ func (m *MockIBCModule) OnRecvPacket(arg0 types.Context, arg1 types1.Packet, arg } // OnRecvPacket indicates an expected call of OnRecvPacket. -func (mr *MockIBCModuleMockRecorder) OnRecvPacket(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnRecvPacket(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnRecvPacket", reflect.TypeOf((*MockIBCModule)(nil).OnRecvPacket), arg0, arg1, arg2) } @@ -160,7 +165,7 @@ func (m *MockIBCModule) OnTimeoutPacket(arg0 types.Context, arg1 types1.Packet, } // OnTimeoutPacket indicates an expected call of OnTimeoutPacket. -func (mr *MockIBCModuleMockRecorder) OnTimeoutPacket(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnTimeoutPacket(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnTimeoutPacket", reflect.TypeOf((*MockIBCModule)(nil).OnTimeoutPacket), arg0, arg1, arg2) } diff --git a/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go b/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go index 47790183..166b5fe7 100644 --- a/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go +++ b/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/cosmos/ibc-go/v8/modules/core/05-port/types (interfaces: ICS4Wrapper) +// +// Generated by this command: +// +// mockgen -package=mock -destination=./test/mock/ics4_wrapper.go github.com/cosmos/ibc-go/v8/modules/core/05-port/types ICS4Wrapper +// // Package mock is a generated GoMock package. package mock @@ -47,7 +52,7 @@ func (m *MockICS4Wrapper) GetAppVersion(arg0 types.Context, arg1, arg2 string) ( } // GetAppVersion indicates an expected call of GetAppVersion. -func (mr *MockICS4WrapperMockRecorder) GetAppVersion(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockICS4WrapperMockRecorder) GetAppVersion(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAppVersion", reflect.TypeOf((*MockICS4Wrapper)(nil).GetAppVersion), arg0, arg1, arg2) } @@ -62,7 +67,7 @@ func (m *MockICS4Wrapper) SendPacket(arg0 types.Context, arg1 *types0.Capability } // SendPacket indicates an expected call of SendPacket. -func (mr *MockICS4WrapperMockRecorder) SendPacket(arg0, arg1, arg2, arg3, arg4, arg5, arg6 interface{}) *gomock.Call { +func (mr *MockICS4WrapperMockRecorder) SendPacket(arg0, arg1, arg2, arg3, arg4, arg5, arg6 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendPacket", reflect.TypeOf((*MockICS4Wrapper)(nil).SendPacket), arg0, arg1, arg2, arg3, arg4, arg5, arg6) } @@ -76,7 +81,7 @@ func (m *MockICS4Wrapper) WriteAcknowledgement(arg0 types.Context, arg1 *types0. } // WriteAcknowledgement indicates an expected call of WriteAcknowledgement. -func (mr *MockICS4WrapperMockRecorder) WriteAcknowledgement(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockICS4WrapperMockRecorder) WriteAcknowledgement(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteAcknowledgement", reflect.TypeOf((*MockICS4Wrapper)(nil).WriteAcknowledgement), arg0, arg1, arg2, arg3) } diff --git a/middleware/packet-forward-middleware/test/mock/transfer_keeper.go b/middleware/packet-forward-middleware/test/mock/transfer_keeper.go index 60ea4c74..8adfa879 100644 --- a/middleware/packet-forward-middleware/test/mock/transfer_keeper.go +++ b/middleware/packet-forward-middleware/test/mock/transfer_keeper.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types (interfaces: TransferKeeper) +// +// Generated by this command: +// +// mockgen -package=mock -destination=./test/mock/transfer_keeper.go github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types TransferKeeper +// // Package mock is a generated GoMock package. package mock @@ -46,7 +51,7 @@ func (m *MockTransferKeeper) DenomPathFromHash(arg0 types.Context, arg1 string) } // DenomPathFromHash indicates an expected call of DenomPathFromHash. -func (mr *MockTransferKeeperMockRecorder) DenomPathFromHash(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTransferKeeperMockRecorder) DenomPathFromHash(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DenomPathFromHash", reflect.TypeOf((*MockTransferKeeper)(nil).DenomPathFromHash), arg0, arg1) } @@ -60,7 +65,7 @@ func (m *MockTransferKeeper) GetTotalEscrowForDenom(arg0 types.Context, arg1 str } // GetTotalEscrowForDenom indicates an expected call of GetTotalEscrowForDenom. -func (mr *MockTransferKeeperMockRecorder) GetTotalEscrowForDenom(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTransferKeeperMockRecorder) GetTotalEscrowForDenom(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTotalEscrowForDenom", reflect.TypeOf((*MockTransferKeeper)(nil).GetTotalEscrowForDenom), arg0, arg1) } @@ -72,7 +77,7 @@ func (m *MockTransferKeeper) SetTotalEscrowForDenom(arg0 types.Context, arg1 typ } // SetTotalEscrowForDenom indicates an expected call of SetTotalEscrowForDenom. -func (mr *MockTransferKeeperMockRecorder) SetTotalEscrowForDenom(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTransferKeeperMockRecorder) SetTotalEscrowForDenom(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTotalEscrowForDenom", reflect.TypeOf((*MockTransferKeeper)(nil).SetTotalEscrowForDenom), arg0, arg1) } @@ -87,7 +92,7 @@ func (m *MockTransferKeeper) Transfer(arg0 context.Context, arg1 *types0.MsgTran } // Transfer indicates an expected call of Transfer. -func (mr *MockTransferKeeperMockRecorder) Transfer(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTransferKeeperMockRecorder) Transfer(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transfer", reflect.TypeOf((*MockTransferKeeper)(nil).Transfer), arg0, arg1) } diff --git a/middleware/packet-forward-middleware/test/setup.go b/middleware/packet-forward-middleware/test/setup.go index 6c525b0e..440d811d 100644 --- a/middleware/packet-forward-middleware/test/setup.go +++ b/middleware/packet-forward-middleware/test/setup.go @@ -20,8 +20,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" @@ -34,33 +32,25 @@ func NewTestSetup(t *testing.T, ctl *gomock.Controller) *Setup { transferKeeperMock := mock.NewMockTransferKeeper(ctl) channelKeeperMock := mock.NewMockChannelKeeper(ctl) - distributionKeeperMock := mock.NewMockDistributionKeeper(ctl) bankKeeperMock := mock.NewMockBankKeeper(ctl) ibcModuleMock := mock.NewMockIBCModule(ctl) ics4WrapperMock := mock.NewMockICS4Wrapper(ctl) - paramsKeeper := initializer.paramsKeeper() - packetforwardKeeper := initializer.packetforwardKeeper(paramsKeeper, transferKeeperMock, channelKeeperMock, distributionKeeperMock, bankKeeperMock, ics4WrapperMock) + packetforwardKeeper := initializer.packetforwardKeeper(transferKeeperMock, channelKeeperMock, bankKeeperMock, ics4WrapperMock) require.NoError(t, initializer.StateStore.LoadLatestVersion()) - if err := packetforwardKeeper.SetParams(initializer.Ctx, types.DefaultParams()); err != nil { - t.Fatal(err) - } - return &Setup{ Initializer: initializer, Keepers: &testKeepers{ - ParamsKeeper: ¶msKeeper, PacketForwardKeeper: packetforwardKeeper, }, Mocks: &testMocks{ - TransferKeeperMock: transferKeeperMock, - DistributionKeeperMock: distributionKeeperMock, - IBCModuleMock: ibcModuleMock, - ICS4WrapperMock: ics4WrapperMock, + TransferKeeperMock: transferKeeperMock, + IBCModuleMock: ibcModuleMock, + ICS4WrapperMock: ics4WrapperMock, }, ForwardMiddleware: initializer.forwardMiddleware(ibcModuleMock, packetforwardKeeper, 0, keeper.DefaultForwardTransferPacketTimeoutTimestamp), @@ -77,15 +67,13 @@ type Setup struct { } type testKeepers struct { - ParamsKeeper *paramskeeper.Keeper PacketForwardKeeper *keeper.Keeper } type testMocks struct { - TransferKeeperMock *mock.MockTransferKeeper - DistributionKeeperMock *mock.MockDistributionKeeper - IBCModuleMock *mock.MockIBCModule - ICS4WrapperMock *mock.MockICS4Wrapper + TransferKeeperMock *mock.MockTransferKeeper + IBCModuleMock *mock.MockIBCModule + ICS4WrapperMock *mock.MockICS4Wrapper } type initializer struct { @@ -120,22 +108,9 @@ func newInitializer(t *testing.T) initializer { } } -func (i initializer) paramsKeeper() paramskeeper.Keeper { - storeKey := storetypes.NewKVStoreKey(paramstypes.StoreKey) - transientStoreKey := storetypes.NewTransientStoreKey(paramstypes.TStoreKey) - i.StateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, i.DB) - i.StateStore.MountStoreWithDB(transientStoreKey, storetypes.StoreTypeTransient, i.DB) - - paramsKeeper := paramskeeper.NewKeeper(i.Marshaler, i.Amino, storeKey, transientStoreKey) - - return paramsKeeper -} - func (i initializer) packetforwardKeeper( - paramsKeeper paramskeeper.Keeper, transferKeeper types.TransferKeeper, channelKeeper types.ChannelKeeper, - distributionKeeper types.DistributionKeeper, bankKeeper types.BankKeeper, ics4Wrapper porttypes.ICS4Wrapper, ) *keeper.Keeper { @@ -149,7 +124,6 @@ func (i initializer) packetforwardKeeper( storeKey, transferKeeper, channelKeeper, - distributionKeeper, bankKeeper, ics4Wrapper, govModuleAddress, diff --git a/middleware/packet-forward-middleware/testing/simapp/app.go b/middleware/packet-forward-middleware/testing/simapp/app.go index fb584d47..a00e367a 100644 --- a/middleware/packet-forward-middleware/testing/simapp/app.go +++ b/middleware/packet-forward-middleware/testing/simapp/app.go @@ -496,7 +496,6 @@ func NewSimApp( app.keys[packetforwardtypes.StoreKey], nil, // Will be zero-value here. Reference is set later on with SetTransferKeeper. app.IBCKeeper.ChannelKeeper, - app.DistrKeeper, app.BankKeeper, app.IBCKeeper.ChannelKeeper, authority, @@ -990,7 +989,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(packetforwardtypes.ModuleName).WithKeyTable(packetforwardtypes.ParamKeyTable()) return paramsKeeper } diff --git a/middleware/packet-forward-middleware/testing/simapp/upgrades/upgrades.go b/middleware/packet-forward-middleware/testing/simapp/upgrades/upgrades.go index 6b156e20..00f35a36 100644 --- a/middleware/packet-forward-middleware/testing/simapp/upgrades/upgrades.go +++ b/middleware/packet-forward-middleware/testing/simapp/upgrades/upgrades.go @@ -4,7 +4,6 @@ import ( "context" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper" - packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" upgradetypes "cosmossdk.io/x/upgrade/types" @@ -36,22 +35,6 @@ func CreateV2UpgradeHandler( packetforwardkeeper *keeper.Keeper, ) upgradetypes.UpgradeHandler { return func(ctx context.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - // NOTE: If you already migrated the previous module, you ONLY need to migrate packetforward case now. - for _, subspace := range paramskeeper.GetSubspaces() { - subspace := subspace - - var keyTable paramstypes.KeyTable - if subspace.Name() == packetforwardtypes.ModuleName { - keyTable = packetforwardtypes.ParamKeyTable() - } else { - continue - } - - if !subspace.HasKeyTable() { - subspace.WithKeyTable(keyTable) - } - } - // Migrate Tendermint consensus parameters from x/params module to a deprecated x/consensus module. // The old params module is required to still be imported in your app.go in order to handle this migration. baseAppLegacySS := paramskeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())