From d8a92a211072f5164fb2f9ce86e6877e3e8a5b00 Mon Sep 17 00:00:00 2001 From: Reece Williams Date: Wed, 11 Oct 2023 16:15:52 -0500 Subject: [PATCH] move to v4 namespace --- middleware/packet-forward-middleware/Makefile | 9 ---- .../packetforward/client/cli/cli.go | 6 +-- .../packetforward/ibc_middleware.go | 11 +---- .../packetforward/keeper/genesis.go | 6 +-- .../packetforward/keeper/grpc_query.go | 6 +-- .../packetforward/keeper/keeper.go | 8 +-- .../packetforward/keeper/params.go | 6 +-- .../packetforward/module.go | 12 ++--- .../packetforward/module_test.go | 10 +--- .../packetforward/types/forward_test.go | 6 +-- .../packetforward/types/genesis.pb.go | 49 ++----------------- .../packetforward/types/query.pb.go | 29 +---------- .../packetforward/types/query.pb.gw.go | 6 +-- .../proto/packetforward/v1/genesis.proto | 12 +---- .../proto/packetforward/v1/query.proto | 13 +---- .../scripts/protocgen.sh | 4 -- .../test/mock/bank_keeper.go | 6 +-- .../test/mock/channel_keeper.go | 6 +-- .../test/mock/distribution_keeper.go | 6 +-- .../test/mock/transfer_keeper.go | 6 +-- .../packet-forward-middleware/test/setup.go | 17 ++----- 21 files changed, 28 insertions(+), 206 deletions(-) diff --git a/middleware/packet-forward-middleware/Makefile b/middleware/packet-forward-middleware/Makefile index 4015bbc2..cba98df0 100644 --- a/middleware/packet-forward-middleware/Makefile +++ b/middleware/packet-forward-middleware/Makefile @@ -143,7 +143,6 @@ cosmovisor: mocks: $(MOCKS_DIR) go install go.uber.org/mock/mockgen@v0.2.0 -<<<<<<< HEAD mockgen -package=mock -destination=./test/mock/transfer_keeper.go $(GOMOD)/router/types TransferKeeper mockgen -package=mock -destination=./test/mock/channel_keeper.go $(GOMOD)/router/types ChannelKeeper mockgen -package=mock -destination=./test/mock/distribution_keeper.go $(GOMOD)/router/types DistributionKeeper @@ -151,14 +150,6 @@ mocks: $(MOCKS_DIR) mockgen -package=mock -destination=./test/mock/channel_keeper.go $(GOMOD)/router/types ChannelKeeper mockgen -package=mock -destination=./test/mock/ics4_wrapper.go github.com/cosmos/ibc-go/v4/modules/core/05-port/types ICS4Wrapper mockgen -package=mock -destination=./test/mock/ibc_module.go github.com/cosmos/ibc-go/v4/modules/core/05-port/types IBCModule -======= - 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/v7/modules/core/05-port/types ICS4Wrapper - mockgen -package=mock -destination=./test/mock/ibc_module.go github.com/cosmos/ibc-go/v7/modules/core/05-port/types IBCModule ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) .PHONY: mocks diff --git a/middleware/packet-forward-middleware/packetforward/client/cli/cli.go b/middleware/packet-forward-middleware/packetforward/client/cli/cli.go index 5256c036..2c1063b3 100644 --- a/middleware/packet-forward-middleware/packetforward/client/cli/cli.go +++ b/middleware/packet-forward-middleware/packetforward/client/cli/cli.go @@ -3,11 +3,7 @@ package cli import ( "fmt" -<<<<<<< HEAD:middleware/packet-forward-middleware/router/client/cli/cli.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/client/cli/cli.go + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" diff --git a/middleware/packet-forward-middleware/packetforward/ibc_middleware.go b/middleware/packet-forward-middleware/packetforward/ibc_middleware.go index 6e9150c8..077fe46d 100644 --- a/middleware/packet-forward-middleware/packetforward/ibc_middleware.go +++ b/middleware/packet-forward-middleware/packetforward/ibc_middleware.go @@ -7,15 +7,8 @@ import ( "time" "github.com/armon/go-metrics" -<<<<<<< HEAD:middleware/packet-forward-middleware/router/ibc_middleware.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - - errorsmod "cosmossdk.io/errors" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/ibc_middleware.go + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" diff --git a/middleware/packet-forward-middleware/packetforward/keeper/genesis.go b/middleware/packet-forward-middleware/packetforward/keeper/genesis.go index 751e00eb..54f63649 100644 --- a/middleware/packet-forward-middleware/packetforward/keeper/genesis.go +++ b/middleware/packet-forward-middleware/packetforward/keeper/genesis.go @@ -1,11 +1,7 @@ package keeper import ( -<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/genesis.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/genesis.go + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go b/middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go index dec1b8bd..6071b2bb 100644 --- a/middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go +++ b/middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go @@ -3,11 +3,7 @@ package keeper import ( "context" -<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/grpc_query.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/middleware/packet-forward-middleware/packetforward/keeper/keeper.go b/middleware/packet-forward-middleware/packetforward/keeper/keeper.go index 831888ba..6489bf43 100644 --- a/middleware/packet-forward-middleware/packetforward/keeper/keeper.go +++ b/middleware/packet-forward-middleware/packetforward/keeper/keeper.go @@ -7,14 +7,8 @@ import ( "time" "github.com/armon/go-metrics" -<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/keeper.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" "github.com/tendermint/tendermint/libs/log" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - - errorsmod "cosmossdk.io/errors" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/keeper.go "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/middleware/packet-forward-middleware/packetforward/keeper/params.go b/middleware/packet-forward-middleware/packetforward/keeper/params.go index 272acfa8..a0c71355 100644 --- a/middleware/packet-forward-middleware/packetforward/keeper/params.go +++ b/middleware/packet-forward-middleware/packetforward/keeper/params.go @@ -1,11 +1,7 @@ package keeper import ( -<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/params.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/params.go + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/middleware/packet-forward-middleware/packetforward/module.go b/middleware/packet-forward-middleware/packetforward/module.go index 570d37e2..e2f0a320 100644 --- a/middleware/packet-forward-middleware/packetforward/module.go +++ b/middleware/packet-forward-middleware/packetforward/module.go @@ -6,15 +6,9 @@ import ( "fmt" "math/rand" -<<<<<<< HEAD:middleware/packet-forward-middleware/router/module.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/client/cli" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/client/cli" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/module.go + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/client/cli" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" diff --git a/middleware/packet-forward-middleware/packetforward/module_test.go b/middleware/packet-forward-middleware/packetforward/module_test.go index 3f888771..ca8d45a6 100644 --- a/middleware/packet-forward-middleware/packetforward/module_test.go +++ b/middleware/packet-forward-middleware/packetforward/module_test.go @@ -5,15 +5,9 @@ import ( "fmt" "testing" -<<<<<<< HEAD:middleware/packet-forward-middleware/router/module_test.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/test" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/test" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/module_test.go "github.com/iancoleman/orderedmap" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/middleware/packet-forward-middleware/packetforward/types/forward_test.go b/middleware/packet-forward-middleware/packetforward/types/forward_test.go index 28809505..6047b1e8 100644 --- a/middleware/packet-forward-middleware/packetforward/types/forward_test.go +++ b/middleware/packet-forward-middleware/packetforward/types/forward_test.go @@ -4,11 +4,7 @@ import ( "encoding/json" "testing" -<<<<<<< HEAD:middleware/packet-forward-middleware/router/types/forward_test.go - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/types/forward_test.go + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" "github.com/stretchr/testify/require" ) diff --git a/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go b/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go index b0648a6e..4575e288 100644 --- a/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go +++ b/middleware/packet-forward-middleware/packetforward/types/genesis.pb.go @@ -265,50 +265,8 @@ func init() { proto.RegisterFile("packetforward/v1/genesis.proto", fileDescripto var fileDescriptor_afd4e56ea31af982 = []byte{ // 645 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0xcd, 0x4e, 0x1b, 0x3b, -<<<<<<< HEAD:middleware/packet-forward-middleware/router/types/genesis.pb.go - 0x14, 0xce, 0x84, 0x10, 0x88, 0x13, 0xfe, 0x7c, 0xe1, 0x32, 0x97, 0x45, 0x12, 0x45, 0xe8, 0xde, - 0xe8, 0xd2, 0x64, 0x04, 0xad, 0x2a, 0xc4, 0xae, 0x29, 0x2d, 0x65, 0xd5, 0x68, 0xc2, 0xaa, 0x52, - 0x35, 0x72, 0x66, 0x4e, 0x26, 0x16, 0x33, 0xf6, 0xd4, 0x76, 0x42, 0xd3, 0xa7, 0xe8, 0xba, 0x9b, - 0xbe, 0x0e, 0x4b, 0x96, 0x55, 0x17, 0x51, 0x05, 0x6f, 0xc0, 0x13, 0x54, 0x63, 0x4f, 0x20, 0x11, - 0x5d, 0x8d, 0x7d, 0xbe, 0x1f, 0x7f, 0xe7, 0x8c, 0x65, 0xb4, 0x2b, 0xf8, 0x48, 0x81, 0x70, 0xc6, - 0x87, 0x4e, 0x08, 0x0c, 0x24, 0x95, 0xed, 0x44, 0x70, 0xc5, 0x71, 0xc9, 0x00, 0xed, 0xf1, 0xe1, - 0xde, 0x76, 0xc8, 0x43, 0xae, 0xab, 0x4e, 0xba, 0x32, 0x84, 0xc6, 0xb7, 0x3c, 0xaa, 0x9c, 0x19, - 0x49, 0x4f, 0x11, 0x05, 0xd8, 0x41, 0xc5, 0x84, 0x08, 0x12, 0x4b, 0xdb, 0xaa, 0x5b, 0xcd, 0xf2, - 0xd1, 0x56, 0xfb, 0xc1, 0xa2, 0xdd, 0xd5, 0x40, 0xa7, 0x70, 0x3d, 0xad, 0xe5, 0xdc, 0x8c, 0x86, - 0xbf, 0xa0, 0x2d, 0xca, 0xbc, 0x41, 0x44, 0xc3, 0xa1, 0xf2, 0x12, 0xe2, 0x5f, 0x82, 0x92, 0x76, - 0xbe, 0xbe, 0xd4, 0x2c, 0x1f, 0x3d, 0x9b, 0xd3, 0xce, 0x1f, 0xd2, 0x3e, 0x67, 0x6f, 0x35, 0xbf, - 0x6b, 0xe8, 0x6f, 0x98, 0x12, 0x93, 0x4e, 0x3d, 0xb5, 0xbd, 0x9f, 0xd6, 0xec, 0x09, 0x89, 0xa3, - 0x93, 0xc6, 0x13, 0xd3, 0x86, 0xbb, 0x41, 0x17, 0x75, 0x7b, 0x1f, 0xd1, 0xf6, 0x9f, 0xac, 0xf0, - 0x26, 0x5a, 0xba, 0x84, 0x89, 0xee, 0xa0, 0xe4, 0xa6, 0x4b, 0xec, 0xa0, 0xe5, 0x31, 0x89, 0x46, - 0x60, 0xe7, 0x75, 0x57, 0xff, 0xcc, 0x25, 0x5b, 0x74, 0x70, 0x0d, 0xef, 0x24, 0x7f, 0x6c, 0x35, - 0x3e, 0xa3, 0xa2, 0x69, 0x19, 0x33, 0xb4, 0x3e, 0x00, 0xf0, 0x12, 0x10, 0x3e, 0x30, 0x45, 0x42, - 0x30, 0xde, 0x9d, 0xb3, 0x34, 0xf3, 0xcf, 0x69, 0xed, 0xdf, 0x90, 0xaa, 0xe1, 0xa8, 0xdf, 0xf6, - 0x79, 0xec, 0xf8, 0x5c, 0xc6, 0x5c, 0x66, 0x9f, 0x96, 0x0c, 0x2e, 0x1d, 0x35, 0x49, 0x40, 0xb6, - 0x4f, 0xc1, 0xbf, 0x9f, 0xd6, 0x76, 0x4c, 0x77, 0x8b, 0x6e, 0x0d, 0x77, 0x6d, 0x00, 0xd0, 0x7d, - 0xdc, 0x7f, 0x2f, 0xa0, 0xf5, 0xc5, 0x5c, 0xf8, 0x25, 0xda, 0xe5, 0x82, 0x86, 0x94, 0x91, 0xc8, - 0x93, 0xc0, 0x02, 0x10, 0x1e, 0x09, 0x02, 0x01, 0x52, 0x66, 0x7d, 0xee, 0xcc, 0xe0, 0x9e, 0x46, - 0x5f, 0x19, 0x10, 0xff, 0x8f, 0xb6, 0x04, 0x0c, 0x46, 0x2c, 0xf0, 0xfc, 0x21, 0x61, 0x0c, 0x22, - 0x8f, 0x06, 0x7a, 0x0a, 0x25, 0x77, 0xc3, 0x00, 0xaf, 0x4d, 0xfd, 0x3c, 0xc0, 0xfb, 0x68, 0x3d, - 0xe3, 0x26, 0x5c, 0xa8, 0x94, 0xb8, 0xa4, 0x89, 0x15, 0x53, 0xed, 0x72, 0xa1, 0xce, 0x03, 0x7c, - 0x88, 0x76, 0xcc, 0x2f, 0xf1, 0xa4, 0xf0, 0xe7, 0x5d, 0x0b, 0x9a, 0x8c, 0x0d, 0xd8, 0x13, 0xfe, - 0xa3, 0xf1, 0x01, 0xc2, 0x73, 0x92, 0x99, 0xf9, 0xb2, 0x49, 0xf1, 0xc0, 0xcf, 0xfc, 0x8f, 0x91, - 0x9d, 0x91, 0x15, 0x8d, 0x81, 0x8f, 0xcc, 0x57, 0x2a, 0x12, 0x27, 0x76, 0xb1, 0x6e, 0x35, 0x0b, - 0xee, 0xdf, 0x06, 0xbf, 0x30, 0xf0, 0xc5, 0x0c, 0xc5, 0x47, 0x0f, 0xc9, 0x66, 0xca, 0x21, 0xa4, - 0x23, 0xb4, 0x57, 0xf4, 0x49, 0x7f, 0x2d, 0xc8, 0xde, 0x69, 0x08, 0xd7, 0x50, 0x39, 0xd3, 0x04, - 0x44, 0x11, 0x7b, 0xb5, 0x6e, 0x35, 0x2b, 0x2e, 0x32, 0xa5, 0x53, 0xa2, 0x08, 0xfe, 0x0f, 0x65, - 0x73, 0xf2, 0x24, 0x7c, 0x1a, 0x01, 0xf3, 0xc1, 0x2e, 0xe9, 0x14, 0xd9, 0xac, 0x7a, 0x59, 0x15, - 0x1f, 0xa4, 0x93, 0x56, 0x82, 0x82, 0xf4, 0x04, 0xc4, 0x84, 0x32, 0xca, 0x42, 0x1b, 0xd5, 0xad, - 0xe6, 0xb2, 0xbb, 0x99, 0x01, 0xee, 0xac, 0x8e, 0x6d, 0xb4, 0x92, 0x65, 0xb4, 0xcb, 0xda, 0x6d, - 0xb6, 0xc5, 0xfb, 0x68, 0x8d, 0x71, 0x66, 0xbc, 0x49, 0x3f, 0x02, 0xbb, 0x52, 0xb7, 0x9a, 0xab, - 0xee, 0x62, 0xb1, 0x43, 0xaf, 0x6f, 0xab, 0xd6, 0xcd, 0x6d, 0xd5, 0xfa, 0x75, 0x5b, 0xb5, 0xbe, - 0xde, 0x55, 0x73, 0x37, 0x77, 0xd5, 0xdc, 0x8f, 0xbb, 0x6a, 0xee, 0xc3, 0xfb, 0xa7, 0x77, 0x91, - 0xf6, 0xfd, 0x16, 0x49, 0x12, 0xe9, 0xc4, 0x34, 0x08, 0x22, 0xb8, 0x22, 0x02, 0x1c, 0xd3, 0x61, - 0x6b, 0xc0, 0xc5, 0x15, 0x11, 0x41, 0x6b, 0x0e, 0x19, 0xbf, 0x70, 0xb2, 0xf7, 0x44, 0x5f, 0xdc, - 0x7e, 0x51, 0x3f, 0x15, 0xcf, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x4a, 0x5b, 0xda, 0x66, - 0x04, 0x00, 0x00, -======= 0x14, 0xce, 0x84, 0x10, 0xc0, 0x09, 0x7f, 0xbe, 0x70, 0xaf, 0xc5, 0x22, 0x19, 0x45, 0xe8, 0x36, - 0x2a, 0x4a, 0x46, 0x80, 0x44, 0x11, 0xbb, 0xa6, 0xb4, 0x94, 0x5d, 0x34, 0x41, 0x5d, 0x74, 0x33, + 0x2a, 0x4a, 0x46, 0x40, 0x85, 0x10, 0xbb, 0xa6, 0xb4, 0x94, 0x5d, 0x34, 0x41, 0x5d, 0x74, 0x33, 0x72, 0x66, 0x4e, 0x26, 0x16, 0x19, 0xcf, 0xd4, 0x76, 0x42, 0xb3, 0xec, 0x1b, 0xf4, 0x0d, 0xfa, 0x0a, 0x7d, 0x0c, 0x96, 0x2c, 0xab, 0x2e, 0xa2, 0x0a, 0xde, 0x80, 0x27, 0xa8, 0x62, 0x4f, 0x20, 0xd3, 0x74, 0x35, 0xf6, 0xf9, 0x7e, 0x7c, 0xce, 0x27, 0x8f, 0x51, 0x25, 0xa1, 0xfe, 0x35, 0xa8, @@ -345,9 +303,8 @@ var fileDescriptor_afd4e56ea31af982 = []byte{ 0x7e, 0xdd, 0x57, 0xac, 0xaf, 0x0f, 0x95, 0xdc, 0xdd, 0x43, 0x25, 0xf7, 0xe3, 0xa1, 0x92, 0xfb, 0xf8, 0x61, 0xf1, 0x2e, 0xb2, 0xae, 0xdf, 0xa0, 0x49, 0x22, 0x9d, 0x88, 0x05, 0xc1, 0x00, 0x6e, 0xa8, 0x00, 0xc7, 0x4c, 0xd8, 0x48, 0x7f, 0x84, 0xc6, 0x1c, 0x32, 0x7a, 0xe5, 0x64, 0xdf, 0x1c, - 0x7d, 0x7f, 0xbb, 0x45, 0xfd, 0x8e, 0x1c, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x23, 0x75, - 0x84, 0x91, 0x04, 0x00, 0x00, ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/types/genesis.pb.go + 0x7d, 0x7f, 0xbb, 0x45, 0xfd, 0x8e, 0x1c, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x48, 0x7d, + 0x21, 0x91, 0x04, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/middleware/packet-forward-middleware/packetforward/types/query.pb.go b/middleware/packet-forward-middleware/packetforward/types/query.pb.go index 09105ff2..3bbd4931 100644 --- a/middleware/packet-forward-middleware/packetforward/types/query.pb.go +++ b/middleware/packet-forward-middleware/packetforward/types/query.pb.go @@ -6,7 +6,6 @@ package types import ( context "context" fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -119,34 +118,11 @@ func init() { func init() { proto.RegisterFile("packetforward/v1/query.proto", fileDescriptor_358c54bd2cc154d0) } -<<<<<<< HEAD:middleware/packet-forward-middleware/router/types/query.pb.go -var fileDescriptor_8961e0cabda3d9d6 = []byte{ - // 295 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x3d, 0x4e, 0xc3, 0x30, - 0x18, 0x86, 0x1b, 0x24, 0x2a, 0x61, 0x26, 0x4c, 0x11, 0x28, 0x2a, 0x16, 0xca, 0x04, 0x43, 0x63, - 0xb5, 0x70, 0x00, 0xc4, 0x05, 0xf8, 0x19, 0xd9, 0x9c, 0xe4, 0xc3, 0x58, 0x6d, 0xf2, 0xb9, 0xb6, - 0x93, 0xaa, 0x2b, 0x27, 0x40, 0xe2, 0x52, 0x8c, 0x95, 0x58, 0x18, 0x51, 0xc2, 0x41, 0x50, 0x7e, - 0xa0, 0x45, 0x88, 0x2d, 0x7a, 0x9f, 0x37, 0xef, 0x63, 0x9b, 0x1c, 0x18, 0xcc, 0x1d, 0x18, 0x5e, - 0x8c, 0xf9, 0x3c, 0x07, 0xb3, 0x0c, 0xb5, 0x41, 0x87, 0x74, 0xa7, 0x8d, 0xc3, 0x62, 0xec, 0x0f, - 0x24, 0x4a, 0x6c, 0x52, 0x5e, 0x7f, 0xb5, 0x05, 0xff, 0x70, 0xfd, 0x9f, 0x84, 0x0c, 0xac, 0xb2, - 0x1d, 0x18, 0x4a, 0x44, 0x39, 0x03, 0x2e, 0xb4, 0xe2, 0x22, 0xcb, 0xd0, 0x09, 0xa7, 0x30, 0xeb, - 0x68, 0x30, 0x20, 0xf4, 0xb6, 0xd6, 0xdc, 0x08, 0x23, 0x52, 0x7b, 0x07, 0xf3, 0x1c, 0xac, 0x0b, - 0x2e, 0xc9, 0xfe, 0xaf, 0xd4, 0x6a, 0xcc, 0x2c, 0xd0, 0x33, 0xd2, 0xd7, 0x4d, 0x72, 0xe4, 0x9d, - 0x78, 0xa7, 0xbb, 0x93, 0xbd, 0xf0, 0xe7, 0x54, 0x61, 0x57, 0xed, 0x0a, 0x13, 0x47, 0xb6, 0x9b, - 0x05, 0x3a, 0x25, 0xfd, 0x16, 0xd1, 0xe3, 0x8d, 0xf6, 0x5f, 0xa7, 0xcf, 0xfe, 0xc3, 0xad, 0x3c, - 0x08, 0x9e, 0xde, 0x3e, 0x5f, 0xb6, 0x86, 0xd4, 0xe7, 0x2a, 0x8a, 0xb9, 0xd0, 0xda, 0xf2, 0xf5, - 0x95, 0x5b, 0xeb, 0x95, 0x7a, 0x2d, 0x99, 0xb7, 0x2a, 0x99, 0xf7, 0x51, 0x32, 0xef, 0xb9, 0x62, - 0xbd, 0x55, 0xc5, 0x7a, 0xef, 0x15, 0xeb, 0xdd, 0x5f, 0x4b, 0xe5, 0x1e, 0xf3, 0x28, 0x8c, 0x31, - 0xe5, 0x31, 0xda, 0x14, 0x6d, 0x3d, 0x33, 0x6a, 0x66, 0x52, 0x95, 0x24, 0x33, 0x58, 0x08, 0x03, - 0x5c, 0x8b, 0x78, 0x0a, 0x6e, 0xf4, 0x80, 0x66, 0x21, 0x4c, 0x32, 0xda, 0x20, 0xc5, 0xc5, 0xb7, - 0xce, 0x2d, 0x35, 0xd8, 0xa8, 0xdf, 0xbc, 0xdf, 0xf9, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, - 0xf0, 0xe7, 0x4c, 0xb0, 0x01, 0x00, 0x00, -======= 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, 0x81, 0x9d, 0x85, 0x15, 0x18, 0x18, 0xd8, 0x9c, 0xc4, 0x04, 0x8b, 0x26, 0xe7, 0xda, + 0x98, 0x16, 0x9e, 0x80, 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, @@ -161,9 +137,8 @@ var fileDescriptor_358c54bd2cc154d0 = []byte{ 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, 0xe0, 0x52, 0xe6, 0xbf, 0xd4, 0x01, + 0xb7, 0x39, 0xf2, 0xc5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x39, 0xee, 0x1a, 0xd4, 0x01, 0x00, 0x00, ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/types/query.pb.go } // Reference imports to suppress errors if they are not otherwise used. diff --git a/middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go b/middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go index 5065a151..8cc70e27 100644 --- a/middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go +++ b/middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go @@ -140,11 +140,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( -<<<<<<< HEAD:middleware/packet-forward-middleware/router/types/query.pb.gw.go - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "apps", "router", "v1", "params"}, "", runtime.AssumeColonVerbOpt(true))) -======= - 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))) ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go + 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(true))) ) var ( diff --git a/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto b/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto index 30414b1f..b3113806 100644 --- a/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto +++ b/middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto @@ -1,18 +1,8 @@ syntax = "proto3"; -<<<<<<< HEAD:middleware/packet-forward-middleware/proto/router/v1/genesis.proto - -package router.v1; -======= package packetforward.v1; ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto - -option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"; -<<<<<<< HEAD:middleware/packet-forward-middleware/proto/router/v1/genesis.proto import "gogoproto/gogo.proto"; -======= -option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"; ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto +option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"; // GenesisState defines the packetforward genesis state message GenesisState { diff --git a/middleware/packet-forward-middleware/proto/packetforward/v1/query.proto b/middleware/packet-forward-middleware/proto/packetforward/v1/query.proto index 2aa2b0a2..49e4027f 100644 --- a/middleware/packet-forward-middleware/proto/packetforward/v1/query.proto +++ b/middleware/packet-forward-middleware/proto/packetforward/v1/query.proto @@ -1,21 +1,10 @@ syntax = "proto3"; -<<<<<<< HEAD:middleware/packet-forward-middleware/proto/router/v1/query.proto - -package router.v1; - -import "gogoproto/gogo.proto"; -import "router/v1/genesis.proto"; -import "google/api/annotations.proto"; - -option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"; -======= 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/v7/packetforward/types"; ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/proto/packetforward/v1/query.proto +option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/middleware/packet-forward-middleware/scripts/protocgen.sh b/middleware/packet-forward-middleware/scripts/protocgen.sh index e109c10d..6a0fc72c 100755 --- a/middleware/packet-forward-middleware/scripts/protocgen.sh +++ b/middleware/packet-forward-middleware/scripts/protocgen.sh @@ -26,11 +26,7 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \ done # move proto files to the right places -<<<<<<< HEAD -cp -r github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/* router/ -======= # # Note: Proto files are suffixed with the current binary version. cp -r github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v*/packetforward/* packetforward/ ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) rm -rf github.com diff --git a/middleware/packet-forward-middleware/test/mock/bank_keeper.go b/middleware/packet-forward-middleware/test/mock/bank_keeper.go index 9989ab73..3f8de637 100644 --- a/middleware/packet-forward-middleware/test/mock/bank_keeper.go +++ b/middleware/packet-forward-middleware/test/mock/bank_keeper.go @@ -1,9 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -<<<<<<< HEAD -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types (interfaces: BankKeeper) -======= -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types (interfaces: BankKeeper) ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) +// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types (interfaces: BankKeeper) // Package mock is a generated GoMock package. package mock diff --git a/middleware/packet-forward-middleware/test/mock/channel_keeper.go b/middleware/packet-forward-middleware/test/mock/channel_keeper.go index 7d7db5bf..dfe7d21d 100644 --- a/middleware/packet-forward-middleware/test/mock/channel_keeper.go +++ b/middleware/packet-forward-middleware/test/mock/channel_keeper.go @@ -1,9 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -<<<<<<< HEAD -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types (interfaces: ChannelKeeper) -======= -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types (interfaces: ChannelKeeper) ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) +// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types (interfaces: ChannelKeeper) // Package mock is a generated GoMock package. package mock diff --git a/middleware/packet-forward-middleware/test/mock/distribution_keeper.go b/middleware/packet-forward-middleware/test/mock/distribution_keeper.go index 8621122e..1bdd8fbf 100644 --- a/middleware/packet-forward-middleware/test/mock/distribution_keeper.go +++ b/middleware/packet-forward-middleware/test/mock/distribution_keeper.go @@ -1,9 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -<<<<<<< HEAD -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types (interfaces: DistributionKeeper) -======= -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types (interfaces: DistributionKeeper) ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) +// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types (interfaces: DistributionKeeper) // Package mock is a generated GoMock package. package mock diff --git a/middleware/packet-forward-middleware/test/mock/transfer_keeper.go b/middleware/packet-forward-middleware/test/mock/transfer_keeper.go index 3a689918..95642807 100644 --- a/middleware/packet-forward-middleware/test/mock/transfer_keeper.go +++ b/middleware/packet-forward-middleware/test/mock/transfer_keeper.go @@ -1,9 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -<<<<<<< HEAD -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types (interfaces: TransferKeeper) -======= -// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types (interfaces: TransferKeeper) ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) +// Source: github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types (interfaces: TransferKeeper) // Package mock is a generated GoMock package. package mock diff --git a/middleware/packet-forward-middleware/test/setup.go b/middleware/packet-forward-middleware/test/setup.go index 8ca67e8e..8557d0dd 100644 --- a/middleware/packet-forward-middleware/test/setup.go +++ b/middleware/packet-forward-middleware/test/setup.go @@ -4,17 +4,10 @@ import ( "testing" "time" -<<<<<<< HEAD - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper" + "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/test/mock" -======= - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/test/mock" ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" @@ -45,11 +38,7 @@ func NewTestSetup(t *testing.T, ctl *gomock.Controller) *Setup { ics4WrapperMock := mock.NewMockICS4Wrapper(ctl) paramsKeeper := initializer.paramsKeeper() -<<<<<<< HEAD - routerKeeper := initializer.routerKeeper(paramsKeeper, transferKeeperMock, channelKeeperMock, distributionKeeperMock, bankKeeperMock, ics4WrapperMock) -======= packetforwardKeeper := initializer.packetforwardKeeper(paramsKeeper, transferKeeperMock, channelKeeperMock, distributionKeeperMock, bankKeeperMock, ics4WrapperMock) ->>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)) require.NoError(t, initializer.StateStore.LoadLatestVersion())