From c725dc2cf4551a0eb5ca98a1e66761f4088807d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?colin=20axn=C3=A9r?= <25233464+colin-axner@users.noreply.github.com> Date: Mon, 22 Feb 2021 15:40:37 +0100 Subject: [PATCH] Fix code import names (#4) * import name changes * make proto-all --- applications/transfer/types/genesis.pb.go | 443 ----- applications/transfer/types/query.pb.go | 1418 ----------------- applications/transfer/types/query.pb.gw.go | 326 ---- applications/transfer/types/transfer.pb.go | 909 ----------- applications/transfer/types/tx.pb.go | 804 ---------- .../transfer/client/cli/cli.go | 0 .../transfer/client/cli/query.go | 2 +- .../transfer/client/cli/tx.go | 6 +- {applications => apps}/transfer/handler.go | 2 +- .../transfer/handler_test.go | 10 +- .../transfer/keeper/MBT_README.md | 0 .../transfer/keeper/encoding.go | 2 +- .../transfer/keeper/genesis.go | 2 +- .../transfer/keeper/genesis_test.go | 2 +- .../transfer/keeper/grpc_query.go | 2 +- .../transfer/keeper/grpc_query_test.go | 2 +- .../transfer/keeper/keeper.go | 6 +- .../transfer/keeper/keeper_test.go | 4 +- .../transfer/keeper/mbt_relay_test.go | 10 +- .../model_based_tests/Test5Packets.json | 0 .../keeper/model_based_tests/Test5Packets.tla | 0 .../Test5PacketsAllDifferentPass.json | 0 .../Test5PacketsAllDifferentPass.tla | 0 .../TestOnRecvAcknowledgementErrorFail.json | 0 .../TestOnRecvAcknowledgementErrorFail.tla | 0 .../TestOnRecvAcknowledgementErrorPass.json | 0 .../TestOnRecvAcknowledgementErrorPass.tla | 0 .../TestOnRecvAcknowledgementResultFail.json | 0 .../TestOnRecvAcknowledgementResultFail.tla | 0 .../TestOnRecvAcknowledgementResultPass.json | 0 .../TestOnRecvAcknowledgementResultPass.tla | 0 .../TestOnRecvPacketFail.json | 0 .../TestOnRecvPacketFail.tla | 0 .../TestOnRecvPacketPass.json | 0 .../TestOnRecvPacketPass.tla | 0 .../model_based_tests/TestOnTimeoutFail.json | 0 .../model_based_tests/TestOnTimeoutFail.tla | 0 .../model_based_tests/TestOnTimeoutPass.json | 0 .../model_based_tests/TestOnTimeoutPass.tla | 0 .../TestSendTransferFail.json | 0 .../TestSendTransferFail.tla | 0 .../TestSendTransferPass.json | 0 .../TestSendTransferPass.tla | 0 .../model_based_tests/TestUnescrowTokens.json | 0 .../model_based_tests/TestUnescrowTokens.tla | 0 .../transfer/keeper/msg_server.go | 2 +- .../transfer/keeper/params.go | 2 +- .../transfer/keeper/params_test.go | 2 +- .../transfer/keeper/relay.go | 8 +- .../transfer/keeper/relay_model/account.tla | 0 .../keeper/relay_model/account_record.tla | 0 .../relay_model/apalache-to-relay-test.json | 0 .../relay_model/apalache-to-relay-test2.json | 0 .../transfer/keeper/relay_model/denom.tla | 0 .../keeper/relay_model/denom_record.tla | 0 .../keeper/relay_model/denom_record2.tla | 0 .../keeper/relay_model/denom_sequence.tla | 0 .../keeper/relay_model/identifiers.tla | 0 .../transfer/keeper/relay_model/relay.tla | 0 .../keeper/relay_model/relay_tests.tla | 0 .../transfer/keeper/relay_test.go | 12 +- {applications => apps}/transfer/module.go | 14 +- .../transfer/module_test.go | 10 +- .../transfer/simulation/decoder.go | 2 +- .../transfer/simulation/decoder_test.go | 4 +- .../transfer/simulation/genesis.go | 2 +- .../transfer/simulation/genesis_test.go | 4 +- .../transfer/simulation/params.go | 2 +- .../transfer/simulation/params_test.go | 2 +- .../transfer/spec/01_concepts.md | 0 .../transfer/spec/02_state.md | 0 .../transfer/spec/03_state_transitions.md | 0 .../transfer/spec/04_messages.md | 0 .../transfer/spec/05_events.md | 0 .../transfer/spec/06_metrics.md | 0 .../transfer/spec/07_params.md | 0 .../transfer/spec/README.md | 0 .../transfer/types/codec.go | 0 {applications => apps}/transfer/types/coin.go | 0 .../transfer/types/errors.go | 0 .../transfer/types/events.go | 0 .../transfer/types/expected_keepers.go | 6 +- .../transfer/types/genesis.go | 2 +- .../transfer/types/genesis_test.go | 2 +- {applications => apps}/transfer/types/keys.go | 0 .../transfer/types/keys_test.go | 2 +- {applications => apps}/transfer/types/msgs.go | 4 +- .../transfer/types/msgs_test.go | 2 +- .../transfer/types/packet.go | 0 .../transfer/types/packet_test.go | 0 .../transfer/types/params.go | 0 .../transfer/types/params_test.go | 0 .../transfer/types/trace.go | 2 +- .../transfer/types/trace_test.go | 0 core/02-client/abci.go | 4 +- core/02-client/abci_test.go | 10 +- core/02-client/client/cli/cli.go | 2 +- core/02-client/client/cli/query.go | 6 +- core/02-client/client/cli/tx.go | 4 +- core/02-client/client/proposal_handler.go | 2 +- core/02-client/client/utils/utils.go | 12 +- core/02-client/genesis.go | 6 +- core/02-client/keeper/client.go | 4 +- core/02-client/keeper/client_test.go | 16 +- core/02-client/keeper/encoding.go | 4 +- core/02-client/keeper/grpc_query.go | 6 +- core/02-client/keeper/grpc_query_test.go | 10 +- core/02-client/keeper/keeper.go | 10 +- core/02-client/keeper/keeper_test.go | 16 +- core/02-client/keeper/params.go | 2 +- core/02-client/keeper/params_test.go | 2 +- core/02-client/keeper/proposal.go | 4 +- core/02-client/keeper/proposal_test.go | 10 +- core/02-client/module.go | 4 +- core/02-client/proposal_handler.go | 4 +- core/02-client/proposal_handler_test.go | 10 +- core/02-client/simulation/decoder.go | 6 +- core/02-client/simulation/decoder_test.go | 8 +- core/02-client/simulation/genesis.go | 2 +- core/02-client/types/client.go | 4 +- core/02-client/types/client_test.go | 6 +- core/02-client/types/codec.go | 2 +- core/02-client/types/codec_test.go | 12 +- core/02-client/types/encoding.go | 2 +- core/02-client/types/events.go | 2 +- core/02-client/types/genesis.go | 4 +- core/02-client/types/genesis_test.go | 18 +- core/02-client/types/height.go | 2 +- core/02-client/types/height_test.go | 2 +- core/02-client/types/keys.go | 2 +- core/02-client/types/keys_test.go | 2 +- core/02-client/types/msgs.go | 4 +- core/02-client/types/msgs_test.go | 12 +- core/02-client/types/params.go | 2 +- core/02-client/types/params_test.go | 2 +- core/02-client/types/proposal_test.go | 6 +- core/02-client/types/query.go | 2 +- core/03-connection/client/cli/cli.go | 2 +- core/03-connection/client/cli/query.go | 6 +- core/03-connection/client/cli/tx.go | 8 +- core/03-connection/client/utils/utils.go | 14 +- core/03-connection/genesis.go | 4 +- core/03-connection/keeper/grpc_query.go | 6 +- core/03-connection/keeper/grpc_query_test.go | 10 +- core/03-connection/keeper/handshake.go | 8 +- core/03-connection/keeper/handshake_test.go | 10 +- core/03-connection/keeper/keeper.go | 10 +- core/03-connection/keeper/keeper_test.go | 6 +- core/03-connection/keeper/verify.go | 4 +- core/03-connection/keeper/verify_test.go | 16 +- core/03-connection/module.go | 4 +- core/03-connection/simulation/decoder.go | 4 +- core/03-connection/simulation/decoder_test.go | 6 +- core/03-connection/simulation/genesis.go | 2 +- core/03-connection/types/codec.go | 2 +- core/03-connection/types/connection.go | 6 +- core/03-connection/types/connection_test.go | 8 +- core/03-connection/types/events.go | 2 +- core/03-connection/types/expected_keepers.go | 2 +- core/03-connection/types/genesis.go | 2 +- core/03-connection/types/genesis_test.go | 6 +- core/03-connection/types/keys.go | 2 +- core/03-connection/types/keys_test.go | 2 +- core/03-connection/types/msgs.go | 8 +- core/03-connection/types/msgs_test.go | 10 +- core/03-connection/types/query.go | 4 +- core/03-connection/types/version.go | 2 +- core/03-connection/types/version_test.go | 6 +- core/04-channel/client/cli/cli.go | 2 +- core/04-channel/client/cli/query.go | 6 +- core/04-channel/client/cli/tx.go | 8 +- core/04-channel/client/utils/utils.go | 12 +- core/04-channel/genesis.go | 4 +- core/04-channel/handler.go | 4 +- core/04-channel/keeper/grpc_query.go | 8 +- core/04-channel/keeper/grpc_query_test.go | 10 +- core/04-channel/keeper/handshake.go | 10 +- core/04-channel/keeper/handshake_test.go | 12 +- core/04-channel/keeper/keeper.go | 12 +- core/04-channel/keeper/keeper_test.go | 6 +- core/04-channel/keeper/packet.go | 10 +- core/04-channel/keeper/packet_test.go | 14 +- core/04-channel/keeper/timeout.go | 8 +- core/04-channel/keeper/timeout_test.go | 10 +- core/04-channel/module.go | 4 +- core/04-channel/simulation/decoder.go | 4 +- core/04-channel/simulation/decoder_test.go | 6 +- core/04-channel/simulation/genesis.go | 2 +- core/04-channel/types/channel.go | 4 +- core/04-channel/types/channel_test.go | 2 +- core/04-channel/types/codec.go | 2 +- core/04-channel/types/events.go | 2 +- core/04-channel/types/expected_keepers.go | 4 +- core/04-channel/types/genesis.go | 2 +- core/04-channel/types/genesis_test.go | 2 +- core/04-channel/types/keys.go | 2 +- core/04-channel/types/keys_test.go | 2 +- core/04-channel/types/msgs.go | 6 +- core/04-channel/types/msgs_test.go | 8 +- core/04-channel/types/packet.go | 6 +- core/04-channel/types/packet_test.go | 4 +- core/04-channel/types/query.go | 4 +- core/05-port/keeper/keeper.go | 4 +- core/05-port/keeper/keeper_test.go | 2 +- core/05-port/types/module.go | 2 +- core/23-commitment/types/codec.go | 2 +- core/23-commitment/types/merkle.go | 2 +- core/23-commitment/types/merkle_test.go | 2 +- core/23-commitment/types/utils_test.go | 2 +- core/24-host/keys.go | 2 +- core/24-host/parse_test.go | 4 +- core/client/cli/cli.go | 8 +- core/client/query.go | 6 +- core/genesis.go | 10 +- core/genesis_test.go | 20 +- core/handler.go | 8 +- core/keeper/grpc_query.go | 6 +- core/keeper/keeper.go | 14 +- core/keeper/msg_server.go | 10 +- core/keeper/msg_server_test.go | 18 +- core/module.go | 18 +- core/simulation/decoder.go | 10 +- core/simulation/decoder_test.go | 12 +- core/simulation/genesis.go | 16 +- core/simulation/genesis_test.go | 6 +- core/types/codec.go | 14 +- core/types/genesis.go | 6 +- core/types/query.go | 12 +- light-clients/06-solomachine/module.go | 2 +- .../06-solomachine/types/client_state.go | 8 +- .../06-solomachine/types/client_state_test.go | 16 +- light-clients/06-solomachine/types/codec.go | 4 +- .../06-solomachine/types/codec_test.go | 10 +- .../06-solomachine/types/consensus_state.go | 4 +- .../types/consensus_state_test.go | 6 +- light-clients/06-solomachine/types/header.go | 4 +- .../06-solomachine/types/header_test.go | 6 +- .../06-solomachine/types/misbehaviour.go | 6 +- .../types/misbehaviour_handle.go | 4 +- .../types/misbehaviour_handle_test.go | 8 +- .../06-solomachine/types/misbehaviour_test.go | 6 +- light-clients/06-solomachine/types/proof.go | 10 +- .../06-solomachine/types/proof_test.go | 6 +- .../06-solomachine/types/proposal_handle.go | 4 +- .../types/proposal_handle_test.go | 8 +- .../06-solomachine/types/solomachine.go | 2 +- .../06-solomachine/types/solomachine_test.go | 8 +- light-clients/06-solomachine/types/update.go | 4 +- .../06-solomachine/types/update_test.go | 8 +- light-clients/07-tendermint/module.go | 2 +- .../07-tendermint/types/client_state.go | 12 +- .../07-tendermint/types/client_state_test.go | 16 +- light-clients/07-tendermint/types/codec.go | 2 +- .../07-tendermint/types/consensus_state.go | 6 +- .../types/consensus_state_test.go | 6 +- light-clients/07-tendermint/types/genesis.go | 4 +- .../07-tendermint/types/genesis_test.go | 6 +- light-clients/07-tendermint/types/header.go | 6 +- .../07-tendermint/types/header_test.go | 6 +- .../07-tendermint/types/misbehaviour.go | 6 +- .../types/misbehaviour_handle.go | 4 +- .../types/misbehaviour_handle_test.go | 12 +- .../07-tendermint/types/misbehaviour_test.go | 10 +- .../07-tendermint/types/proposal_handle.go | 4 +- .../types/proposal_handle_test.go | 8 +- light-clients/07-tendermint/types/store.go | 6 +- .../07-tendermint/types/store_test.go | 14 +- .../07-tendermint/types/tendermint_test.go | 8 +- light-clients/07-tendermint/types/update.go | 6 +- .../07-tendermint/types/update_test.go | 10 +- light-clients/07-tendermint/types/upgrade.go | 6 +- .../07-tendermint/types/upgrade_test.go | 8 +- light-clients/09-localhost/module.go | 2 +- .../09-localhost/types/client_state.go | 10 +- .../09-localhost/types/client_state_test.go | 16 +- light-clients/09-localhost/types/codec.go | 2 +- .../09-localhost/types/localhost_test.go | 4 +- testing/chain.go | 20 +- testing/chain_test.go | 4 +- testing/coordinator.go | 6 +- testing/mock/mock.go | 4 +- testing/mock/privval_test.go | 2 +- testing/solomachine.go | 10 +- testing/types.go | 2 +- 284 files changed, 685 insertions(+), 4585 deletions(-) delete mode 100644 applications/transfer/types/genesis.pb.go delete mode 100644 applications/transfer/types/query.pb.go delete mode 100644 applications/transfer/types/query.pb.gw.go delete mode 100644 applications/transfer/types/transfer.pb.go delete mode 100644 applications/transfer/types/tx.pb.go rename {applications => apps}/transfer/client/cli/cli.go (100%) rename {applications => apps}/transfer/client/cli/query.go (97%) rename {applications => apps}/transfer/client/cli/tx.go (94%) rename {applications => apps}/transfer/handler.go (90%) rename {applications => apps}/transfer/handler_test.go (95%) rename {applications => apps}/transfer/keeper/MBT_README.md (100%) rename {applications => apps}/transfer/keeper/encoding.go (94%) rename {applications => apps}/transfer/keeper/genesis.go (94%) rename {applications => apps}/transfer/keeper/genesis_test.go (92%) rename {applications => apps}/transfer/keeper/grpc_query.go (96%) rename {applications => apps}/transfer/keeper/grpc_query_test.go (97%) rename {applications => apps}/transfer/keeper/keeper.go (96%) rename {applications => apps}/transfer/keeper/keeper_test.go (92%) rename {applications => apps}/transfer/keeper/mbt_relay_test.go (97%) rename {applications => apps}/transfer/keeper/model_based_tests/Test5Packets.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/Test5Packets.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvPacketFail.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvPacketFail.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvPacketPass.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnRecvPacketPass.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnTimeoutFail.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnTimeoutFail.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnTimeoutPass.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestOnTimeoutPass.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestSendTransferFail.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestSendTransferFail.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestSendTransferPass.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestSendTransferPass.tla (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestUnescrowTokens.json (100%) rename {applications => apps}/transfer/keeper/model_based_tests/TestUnescrowTokens.tla (100%) rename {applications => apps}/transfer/keeper/msg_server.go (95%) rename {applications => apps}/transfer/keeper/params.go (92%) rename {applications => apps}/transfer/keeper/params_test.go (86%) rename {applications => apps}/transfer/keeper/relay.go (98%) rename {applications => apps}/transfer/keeper/relay_model/account.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/account_record.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/apalache-to-relay-test.json (100%) rename {applications => apps}/transfer/keeper/relay_model/apalache-to-relay-test2.json (100%) rename {applications => apps}/transfer/keeper/relay_model/denom.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/denom_record.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/denom_record2.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/denom_sequence.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/identifiers.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/relay.tla (100%) rename {applications => apps}/transfer/keeper/relay_model/relay_tests.tla (100%) rename {applications => apps}/transfer/keeper/relay_test.go (97%) rename {applications => apps}/transfer/module.go (96%) rename {applications => apps}/transfer/module_test.go (95%) rename {applications => apps}/transfer/simulation/decoder.go (93%) rename {applications => apps}/transfer/simulation/decoder_test.go (90%) rename {applications => apps}/transfer/simulation/genesis.go (95%) rename {applications => apps}/transfer/simulation/genesis_test.go (94%) rename {applications => apps}/transfer/simulation/params.go (93%) rename {applications => apps}/transfer/simulation/params_test.go (91%) rename {applications => apps}/transfer/spec/01_concepts.md (100%) rename {applications => apps}/transfer/spec/02_state.md (100%) rename {applications => apps}/transfer/spec/03_state_transitions.md (100%) rename {applications => apps}/transfer/spec/04_messages.md (100%) rename {applications => apps}/transfer/spec/05_events.md (100%) rename {applications => apps}/transfer/spec/06_metrics.md (100%) rename {applications => apps}/transfer/spec/07_params.md (100%) rename {applications => apps}/transfer/spec/README.md (100%) rename {applications => apps}/transfer/types/codec.go (100%) rename {applications => apps}/transfer/types/coin.go (100%) rename {applications => apps}/transfer/types/errors.go (100%) rename {applications => apps}/transfer/types/events.go (100%) rename {applications => apps}/transfer/types/expected_keepers.go (90%) rename {applications => apps}/transfer/types/genesis.go (93%) rename {applications => apps}/transfer/types/genesis_test.go (91%) rename {applications => apps}/transfer/types/keys.go (100%) rename {applications => apps}/transfer/types/keys_test.go (88%) rename {applications => apps}/transfer/types/msgs.go (95%) rename {applications => apps}/transfer/types/msgs_test.go (98%) rename {applications => apps}/transfer/types/packet.go (100%) rename {applications => apps}/transfer/types/packet_test.go (100%) rename {applications => apps}/transfer/types/params.go (100%) rename {applications => apps}/transfer/types/params_test.go (100%) rename {applications => apps}/transfer/types/trace.go (99%) rename {applications => apps}/transfer/types/trace_test.go (100%) diff --git a/applications/transfer/types/genesis.pb.go b/applications/transfer/types/genesis.pb.go deleted file mode 100644 index 3ae0442f826..00000000000 --- a/applications/transfer/types/genesis.pb.go +++ /dev/null @@ -1,443 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ibc/applications/transfer/v1/genesis.proto - -package types - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - 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 - -// GenesisState defines the ibc-transfer genesis state -type GenesisState struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - DenomTraces Traces `protobuf:"bytes,2,rep,name=denom_traces,json=denomTraces,proto3,castrepeated=Traces" json:"denom_traces" yaml:"denom_traces"` - Params Params `protobuf:"bytes,3,opt,name=params,proto3" json:"params"` -} - -func (m *GenesisState) Reset() { *m = GenesisState{} } -func (m *GenesisState) String() string { return proto.CompactTextString(m) } -func (*GenesisState) ProtoMessage() {} -func (*GenesisState) Descriptor() ([]byte, []int) { - return fileDescriptor_a4f788affd5bea89, []int{0} -} -func (m *GenesisState) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_GenesisState.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 *GenesisState) XXX_Merge(src proto.Message) { - xxx_messageInfo_GenesisState.Merge(m, src) -} -func (m *GenesisState) XXX_Size() int { - return m.Size() -} -func (m *GenesisState) XXX_DiscardUnknown() { - xxx_messageInfo_GenesisState.DiscardUnknown(m) -} - -var xxx_messageInfo_GenesisState proto.InternalMessageInfo - -func (m *GenesisState) GetPortId() string { - if m != nil { - return m.PortId - } - return "" -} - -func (m *GenesisState) GetDenomTraces() Traces { - if m != nil { - return m.DenomTraces - } - return nil -} - -func (m *GenesisState) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - -func init() { - proto.RegisterType((*GenesisState)(nil), "ibc.applications.transfer.v1.GenesisState") -} - -func init() { - proto.RegisterFile("ibc/applications/transfer/v1/genesis.proto", fileDescriptor_a4f788affd5bea89) -} - -var fileDescriptor_a4f788affd5bea89 = []byte{ - // 317 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0x4c, 0x4a, 0xd6, - 0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x2f, 0x29, 0x4a, - 0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xd2, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, - 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc9, 0x4c, 0x4a, 0xd6, 0x43, 0x56, 0xab, 0x07, - 0x53, 0xab, 0x57, 0x66, 0x28, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, - 0xf4, 0x48, 0x69, 0xe3, 0x35, 0x1f, 0xae, 0x1f, 0xac, 0x58, 0xe9, 0x33, 0x23, 0x17, 0x8f, 0x3b, - 0xc4, 0xca, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x6d, 0x2e, 0xf6, 0x82, 0xfc, 0xa2, 0x92, 0xf8, - 0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0xa1, 0x4f, 0xf7, 0xe4, 0xf9, 0x2a, 0x13, - 0x73, 0x73, 0xac, 0x94, 0xa0, 0x12, 0x4a, 0x41, 0x6c, 0x20, 0x96, 0x67, 0x8a, 0x50, 0x11, 0x17, - 0x4f, 0x4a, 0x6a, 0x5e, 0x7e, 0x6e, 0x7c, 0x49, 0x51, 0x62, 0x72, 0x6a, 0xb1, 0x04, 0x93, 0x02, - 0xb3, 0x06, 0xb7, 0x91, 0x86, 0x1e, 0x3e, 0x57, 0xeb, 0xb9, 0x80, 0x74, 0x84, 0x80, 0x34, 0x38, - 0xa9, 0x9e, 0xb8, 0x27, 0xcf, 0xf0, 0xe9, 0x9e, 0xbc, 0x30, 0xc4, 0x7c, 0x64, 0xb3, 0x94, 0x56, - 0xdd, 0x97, 0x67, 0x03, 0xab, 0x2a, 0x0e, 0xe2, 0x4e, 0x81, 0x6b, 0x29, 0x16, 0x72, 0xe2, 0x62, - 0x2b, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0x96, 0x60, 0x56, 0x60, 0xd4, 0xe0, 0x36, 0x52, 0xc1, 0x6f, - 0x5b, 0x00, 0x58, 0xad, 0x13, 0x0b, 0xc8, 0xa6, 0x20, 0xa8, 0x4e, 0xa7, 0x88, 0x13, 0x8f, 0xe4, - 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, - 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, - 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0x86, 0x52, 0xba, 0xc5, 0x29, 0xd9, 0xfa, - 0x15, 0xfa, 0xb8, 0xc3, 0xb6, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xac, 0xc6, 0x80, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0xbb, 0x81, 0x1e, 0xe5, 0x01, 0x00, 0x00, -} - -func (m *GenesisState) 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 *GenesisState) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *GenesisState) 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 = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - if len(m.DenomTraces) > 0 { - for iNdEx := len(m.DenomTraces) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.DenomTraces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.PortId) > 0 { - i -= len(m.PortId) - copy(dAtA[i:], m.PortId) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.PortId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { - offset -= sovGenesis(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *GenesisState) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.PortId) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - if len(m.DenomTraces) > 0 { - for _, e := range m.DenomTraces { - l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - } - l = m.Params.Size() - n += 1 + l + sovGenesis(uint64(l)) - return n -} - -func sovGenesis(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozGenesis(x uint64) (n int) { - return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *GenesisState) 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: GenesisState: wiretype end group for non-group") - } - if fieldNum <= 0 { - 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 PortId", 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 - } - m.PortId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DenomTraces", 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 - } - m.DenomTraces = append(m.DenomTraces, DenomTrace{}) - if err := m.DenomTraces[len(m.DenomTraces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - 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 - 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 skipGenesis(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, ErrIntOverflowGenesis - } - 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, ErrIntOverflowGenesis - } - 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, ErrIntOverflowGenesis - } - 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, ErrInvalidLengthGenesis - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupGenesis - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthGenesis - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthGenesis = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGenesis = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupGenesis = fmt.Errorf("proto: unexpected end of group") -) diff --git a/applications/transfer/types/query.pb.go b/applications/transfer/types/query.pb.go deleted file mode 100644 index 1c1d6929519..00000000000 --- a/applications/transfer/types/query.pb.go +++ /dev/null @@ -1,1418 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ibc/applications/transfer/v1/query.proto - -package types - -import ( - context "context" - fmt "fmt" - query "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/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 - -// QueryDenomTraceRequest is the request type for the Query/DenomTrace RPC -// method -type QueryDenomTraceRequest struct { - // hash (in hex format) of the denomination trace information. - Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` -} - -func (m *QueryDenomTraceRequest) Reset() { *m = QueryDenomTraceRequest{} } -func (m *QueryDenomTraceRequest) String() string { return proto.CompactTextString(m) } -func (*QueryDenomTraceRequest) ProtoMessage() {} -func (*QueryDenomTraceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a638e2800a01538c, []int{0} -} -func (m *QueryDenomTraceRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryDenomTraceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryDenomTraceRequest.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 *QueryDenomTraceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryDenomTraceRequest.Merge(m, src) -} -func (m *QueryDenomTraceRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryDenomTraceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryDenomTraceRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryDenomTraceRequest proto.InternalMessageInfo - -func (m *QueryDenomTraceRequest) GetHash() string { - if m != nil { - return m.Hash - } - return "" -} - -// QueryDenomTraceResponse is the response type for the Query/DenomTrace RPC -// method. -type QueryDenomTraceResponse struct { - // denom_trace returns the requested denomination trace information. - DenomTrace *DenomTrace `protobuf:"bytes,1,opt,name=denom_trace,json=denomTrace,proto3" json:"denom_trace,omitempty"` -} - -func (m *QueryDenomTraceResponse) Reset() { *m = QueryDenomTraceResponse{} } -func (m *QueryDenomTraceResponse) String() string { return proto.CompactTextString(m) } -func (*QueryDenomTraceResponse) ProtoMessage() {} -func (*QueryDenomTraceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a638e2800a01538c, []int{1} -} -func (m *QueryDenomTraceResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryDenomTraceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryDenomTraceResponse.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 *QueryDenomTraceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryDenomTraceResponse.Merge(m, src) -} -func (m *QueryDenomTraceResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryDenomTraceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryDenomTraceResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryDenomTraceResponse proto.InternalMessageInfo - -func (m *QueryDenomTraceResponse) GetDenomTrace() *DenomTrace { - if m != nil { - return m.DenomTrace - } - return nil -} - -// QueryConnectionsRequest is the request type for the Query/DenomTraces RPC -// method -type QueryDenomTracesRequest struct { - // pagination defines an optional pagination for the request. - Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryDenomTracesRequest) Reset() { *m = QueryDenomTracesRequest{} } -func (m *QueryDenomTracesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryDenomTracesRequest) ProtoMessage() {} -func (*QueryDenomTracesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a638e2800a01538c, []int{2} -} -func (m *QueryDenomTracesRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryDenomTracesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryDenomTracesRequest.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 *QueryDenomTracesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryDenomTracesRequest.Merge(m, src) -} -func (m *QueryDenomTracesRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryDenomTracesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryDenomTracesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryDenomTracesRequest proto.InternalMessageInfo - -func (m *QueryDenomTracesRequest) GetPagination() *query.PageRequest { - if m != nil { - return m.Pagination - } - return nil -} - -// QueryConnectionsResponse is the response type for the Query/DenomTraces RPC -// method. -type QueryDenomTracesResponse struct { - // denom_traces returns all denominations trace information. - DenomTraces Traces `protobuf:"bytes,1,rep,name=denom_traces,json=denomTraces,proto3,castrepeated=Traces" json:"denom_traces"` - // pagination defines the pagination in the response. - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryDenomTracesResponse) Reset() { *m = QueryDenomTracesResponse{} } -func (m *QueryDenomTracesResponse) String() string { return proto.CompactTextString(m) } -func (*QueryDenomTracesResponse) ProtoMessage() {} -func (*QueryDenomTracesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a638e2800a01538c, []int{3} -} -func (m *QueryDenomTracesResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryDenomTracesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryDenomTracesResponse.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 *QueryDenomTracesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryDenomTracesResponse.Merge(m, src) -} -func (m *QueryDenomTracesResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryDenomTracesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryDenomTracesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryDenomTracesResponse proto.InternalMessageInfo - -func (m *QueryDenomTracesResponse) GetDenomTraces() Traces { - if m != nil { - return m.DenomTraces - } - return nil -} - -func (m *QueryDenomTracesResponse) GetPagination() *query.PageResponse { - if m != nil { - return m.Pagination - } - return nil -} - -// 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_a638e2800a01538c, []int{4} -} -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_a638e2800a01538c, []int{5} -} -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((*QueryDenomTraceRequest)(nil), "ibc.applications.transfer.v1.QueryDenomTraceRequest") - proto.RegisterType((*QueryDenomTraceResponse)(nil), "ibc.applications.transfer.v1.QueryDenomTraceResponse") - proto.RegisterType((*QueryDenomTracesRequest)(nil), "ibc.applications.transfer.v1.QueryDenomTracesRequest") - proto.RegisterType((*QueryDenomTracesResponse)(nil), "ibc.applications.transfer.v1.QueryDenomTracesResponse") - proto.RegisterType((*QueryParamsRequest)(nil), "ibc.applications.transfer.v1.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "ibc.applications.transfer.v1.QueryParamsResponse") -} - -func init() { - proto.RegisterFile("ibc/applications/transfer/v1/query.proto", fileDescriptor_a638e2800a01538c) -} - -var fileDescriptor_a638e2800a01538c = []byte{ - // 528 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x3f, 0x6f, 0xd3, 0x40, - 0x14, 0xcf, 0x95, 0x12, 0x89, 0x17, 0xc4, 0x70, 0x54, 0x10, 0x59, 0x95, 0x5b, 0x59, 0x08, 0x02, - 0x85, 0x3b, 0x5c, 0xa0, 0x30, 0xa0, 0x0e, 0x15, 0x02, 0xb1, 0x95, 0xc0, 0x80, 0x60, 0x40, 0x67, - 0xe7, 0x70, 0x2c, 0x1a, 0x9f, 0xeb, 0xbb, 0x44, 0x54, 0x88, 0x85, 0x4f, 0x80, 0xc4, 0x8e, 0x98, - 0xd9, 0x19, 0xd8, 0x18, 0x3b, 0x56, 0x62, 0x61, 0x02, 0x94, 0xf0, 0x41, 0x90, 0xef, 0xce, 0x8d, - 0xa3, 0x20, 0x13, 0x4f, 0x39, 0x5d, 0xde, 0xef, 0xfd, 0xfe, 0xbc, 0xe7, 0x83, 0x4e, 0x1c, 0x84, - 0x94, 0xa5, 0xe9, 0x5e, 0x1c, 0x32, 0x15, 0x8b, 0x44, 0x52, 0x95, 0xb1, 0x44, 0xbe, 0xe4, 0x19, - 0x1d, 0xf9, 0x74, 0x7f, 0xc8, 0xb3, 0x03, 0x92, 0x66, 0x42, 0x09, 0xbc, 0x1a, 0x07, 0x21, 0x29, - 0x57, 0x92, 0xa2, 0x92, 0x8c, 0x7c, 0x67, 0x25, 0x12, 0x91, 0xd0, 0x85, 0x34, 0x3f, 0x19, 0x8c, - 0x73, 0x25, 0x14, 0x72, 0x20, 0x24, 0x0d, 0x98, 0xe4, 0xa6, 0x19, 0x1d, 0xf9, 0x01, 0x57, 0xcc, - 0xa7, 0x29, 0x8b, 0xe2, 0x44, 0x37, 0xb2, 0xb5, 0x1b, 0x95, 0x4a, 0x8e, 0xb9, 0x4c, 0xf1, 0x6a, - 0x24, 0x44, 0xb4, 0xc7, 0x29, 0x4b, 0x63, 0xca, 0x92, 0x44, 0x28, 0x2b, 0x49, 0xff, 0xeb, 0x5d, - 0x85, 0x73, 0x8f, 0x72, 0xb2, 0x7b, 0x3c, 0x11, 0x83, 0x27, 0x19, 0x0b, 0x79, 0x97, 0xef, 0x0f, - 0xb9, 0x54, 0x18, 0xc3, 0x72, 0x9f, 0xc9, 0x7e, 0x1b, 0xad, 0xa3, 0xce, 0xa9, 0xae, 0x3e, 0x7b, - 0x3d, 0x38, 0x3f, 0x57, 0x2d, 0x53, 0x91, 0x48, 0x8e, 0x1f, 0x42, 0xab, 0x97, 0xdf, 0xbe, 0x50, - 0xf9, 0xb5, 0x46, 0xb5, 0x36, 0x3b, 0xa4, 0x2a, 0x09, 0x52, 0x6a, 0x03, 0xbd, 0xe3, 0xb3, 0xc7, - 0xe6, 0x58, 0x64, 0x21, 0xea, 0x3e, 0xc0, 0x34, 0x0d, 0x4b, 0x72, 0x91, 0x98, 0xe8, 0x48, 0x1e, - 0x1d, 0x31, 0x73, 0xb0, 0xd1, 0x91, 0x5d, 0x16, 0x15, 0x86, 0xba, 0x25, 0xa4, 0xf7, 0x0d, 0x41, - 0x7b, 0x9e, 0xc3, 0x5a, 0x79, 0x0e, 0xa7, 0x4b, 0x56, 0x64, 0x1b, 0xad, 0x9f, 0xa8, 0xe3, 0x65, - 0xe7, 0xcc, 0xe1, 0xcf, 0xb5, 0xc6, 0xe7, 0x5f, 0x6b, 0x4d, 0xdb, 0xb7, 0x35, 0xf5, 0x26, 0xf1, - 0x83, 0x19, 0x07, 0x4b, 0xda, 0xc1, 0xa5, 0xff, 0x3a, 0x30, 0xca, 0x66, 0x2c, 0xac, 0x00, 0xd6, - 0x0e, 0x76, 0x59, 0xc6, 0x06, 0x45, 0x40, 0xde, 0x63, 0x38, 0x3b, 0x73, 0x6b, 0x2d, 0xdd, 0x85, - 0x66, 0xaa, 0x6f, 0x6c, 0x66, 0x17, 0xaa, 0xcd, 0x58, 0xb4, 0xc5, 0x6c, 0x7e, 0x5c, 0x86, 0x93, - 0xba, 0x2b, 0xfe, 0x8a, 0x00, 0xa6, 0x4e, 0xf1, 0xcd, 0xea, 0x36, 0xff, 0xde, 0x2c, 0xe7, 0x56, - 0x4d, 0x94, 0xf1, 0xe0, 0x6d, 0xbf, 0xfb, 0xfe, 0xe7, 0xc3, 0xd2, 0x1d, 0xbc, 0x45, 0xab, 0xd6, - 0xdf, 0x7c, 0x32, 0xe5, 0xf9, 0xd1, 0x37, 0xf9, 0xee, 0xbe, 0xc5, 0x5f, 0x10, 0xb4, 0x4a, 0xe3, - 0xc6, 0xf5, 0x64, 0x14, 0x09, 0x3b, 0x5b, 0x75, 0x61, 0x56, 0xfe, 0x6d, 0x2d, 0xdf, 0xc7, 0xb4, - 0xa6, 0x7c, 0xfc, 0x09, 0x41, 0xd3, 0x0c, 0x04, 0x5f, 0x5f, 0x80, 0x7b, 0x66, 0x1f, 0x1c, 0xbf, - 0x06, 0xc2, 0x0a, 0xf5, 0xb5, 0xd0, 0x0d, 0x7c, 0x79, 0x01, 0xa1, 0x66, 0x41, 0x76, 0x9e, 0x1e, - 0x8e, 0x5d, 0x74, 0x34, 0x76, 0xd1, 0xef, 0xb1, 0x8b, 0xde, 0x4f, 0xdc, 0xc6, 0xd1, 0xc4, 0x6d, - 0xfc, 0x98, 0xb8, 0x8d, 0x67, 0xdb, 0x51, 0xac, 0xfa, 0xc3, 0x80, 0x84, 0x62, 0x40, 0xed, 0x0b, - 0x67, 0x7e, 0xae, 0xc9, 0xde, 0x2b, 0xfa, 0xba, 0x82, 0x42, 0x1d, 0xa4, 0x5c, 0x06, 0x4d, 0xfd, - 0x4c, 0xdd, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x7f, 0xfe, 0xbd, 0x7d, 0x05, 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 { - // DenomTrace queries a denomination trace information. - DenomTrace(ctx context.Context, in *QueryDenomTraceRequest, opts ...grpc.CallOption) (*QueryDenomTraceResponse, error) - // DenomTraces queries all denomination traces. - DenomTraces(ctx context.Context, in *QueryDenomTracesRequest, opts ...grpc.CallOption) (*QueryDenomTracesResponse, error) - // Params queries all parameters of the ibc-transfer 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) DenomTrace(ctx context.Context, in *QueryDenomTraceRequest, opts ...grpc.CallOption) (*QueryDenomTraceResponse, error) { - out := new(QueryDenomTraceResponse) - err := c.cc.Invoke(ctx, "/ibc.applications.transfer.v1.Query/DenomTrace", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) DenomTraces(ctx context.Context, in *QueryDenomTracesRequest, opts ...grpc.CallOption) (*QueryDenomTracesResponse, error) { - out := new(QueryDenomTracesResponse) - err := c.cc.Invoke(ctx, "/ibc.applications.transfer.v1.Query/DenomTraces", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { - out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/ibc.applications.transfer.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 { - // DenomTrace queries a denomination trace information. - DenomTrace(context.Context, *QueryDenomTraceRequest) (*QueryDenomTraceResponse, error) - // DenomTraces queries all denomination traces. - DenomTraces(context.Context, *QueryDenomTracesRequest) (*QueryDenomTracesResponse, error) - // Params queries all parameters of the ibc-transfer module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) -} - -// UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct { -} - -func (*UnimplementedQueryServer) DenomTrace(ctx context.Context, req *QueryDenomTraceRequest) (*QueryDenomTraceResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DenomTrace not implemented") -} -func (*UnimplementedQueryServer) DenomTraces(ctx context.Context, req *QueryDenomTracesRequest) (*QueryDenomTracesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DenomTraces not implemented") -} -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_DenomTrace_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryDenomTraceRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).DenomTrace(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ibc.applications.transfer.v1.Query/DenomTrace", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).DenomTrace(ctx, req.(*QueryDenomTraceRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_DenomTraces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryDenomTracesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).DenomTraces(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ibc.applications.transfer.v1.Query/DenomTraces", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).DenomTraces(ctx, req.(*QueryDenomTracesRequest)) - } - return interceptor(ctx, in, info, handler) -} - -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: "/ibc.applications.transfer.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: "ibc.applications.transfer.v1.Query", - HandlerType: (*QueryServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "DenomTrace", - Handler: _Query_DenomTrace_Handler, - }, - { - MethodName: "DenomTraces", - Handler: _Query_DenomTraces_Handler, - }, - { - MethodName: "Params", - Handler: _Query_Params_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "ibc/applications/transfer/v1/query.proto", -} - -func (m *QueryDenomTraceRequest) 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 *QueryDenomTraceRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryDenomTraceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Hash) > 0 { - i -= len(m.Hash) - copy(dAtA[i:], m.Hash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Hash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryDenomTraceResponse) 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 *QueryDenomTraceResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryDenomTraceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.DenomTrace != nil { - { - size, err := m.DenomTrace.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 (m *QueryDenomTracesRequest) 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 *QueryDenomTracesRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryDenomTracesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.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 (m *QueryDenomTracesResponse) 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 *QueryDenomTracesResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryDenomTracesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if len(m.DenomTraces) > 0 { - for iNdEx := len(m.DenomTraces) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.DenomTraces[iNdEx].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 (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 *QueryDenomTraceRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Hash) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryDenomTraceResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.DenomTrace != nil { - l = m.DenomTrace.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryDenomTracesRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryDenomTracesResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.DenomTraces) > 0 { - for _, e := range m.DenomTraces { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -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 *QueryDenomTraceRequest) 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: QueryDenomTraceRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomTraceRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Hash = string(dAtA[iNdEx:postIndex]) - 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 (m *QueryDenomTraceResponse) 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: QueryDenomTraceResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomTraceResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DenomTrace", 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.DenomTrace == nil { - m.DenomTrace = &DenomTrace{} - } - if err := m.DenomTrace.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 (m *QueryDenomTracesRequest) 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: QueryDenomTracesRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomTracesRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", 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.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.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 (m *QueryDenomTracesResponse) 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: QueryDenomTracesResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDenomTracesResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DenomTraces", 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 - } - m.DenomTraces = append(m.DenomTraces, DenomTrace{}) - if err := m.DenomTraces[len(m.DenomTraces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", 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.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.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 (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/applications/transfer/types/query.pb.gw.go b/applications/transfer/types/query.pb.gw.go deleted file mode 100644 index 007ed668207..00000000000 --- a/applications/transfer/types/query.pb.gw.go +++ /dev/null @@ -1,326 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: ibc/applications/transfer/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/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 - -func request_Query_DenomTrace_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomTraceRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["hash"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") - } - - protoReq.Hash, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) - } - - msg, err := client.DenomTrace(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_DenomTrace_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomTraceRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["hash"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hash") - } - - protoReq.Hash, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hash", err) - } - - msg, err := server.DenomTrace(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Query_DenomTraces_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Query_DenomTraces_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomTracesRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_DenomTraces_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.DenomTraces(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_DenomTraces_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomTracesRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_DenomTraces_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.DenomTraces(ctx, &protoReq) - return msg, metadata, err - -} - -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 (such as grpc.SendHeader, etc) to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. -func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { - - mux.Handle("GET", pattern_Query_DenomTrace_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.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_DenomTrace_0(rctx, inboundMarshaler, server, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_DenomTrace_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_DenomTraces_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.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_DenomTraces_0(rctx, inboundMarshaler, server, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_DenomTraces_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - 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.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) - 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_DenomTrace_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_DenomTrace_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_DenomTrace_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_DenomTraces_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_DenomTraces_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_DenomTraces_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - 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_DenomTrace_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"ibc", "applications", "transfer", "v1beta1", "denom_traces", "hash"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_DenomTraces_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "applications", "transfer", "v1beta1", "denom_traces"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "applications", "transfer", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false))) -) - -var ( - forward_Query_DenomTrace_0 = runtime.ForwardResponseMessage - - forward_Query_DenomTraces_0 = runtime.ForwardResponseMessage - - forward_Query_Params_0 = runtime.ForwardResponseMessage -) diff --git a/applications/transfer/types/transfer.pb.go b/applications/transfer/types/transfer.pb.go deleted file mode 100644 index 62734b85a49..00000000000 --- a/applications/transfer/types/transfer.pb.go +++ /dev/null @@ -1,909 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ibc/applications/transfer/v1/transfer.proto - -package types - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - 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 - -// FungibleTokenPacketData defines a struct for the packet payload -// See FungibleTokenPacketData spec: -// https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer#data-structures -type FungibleTokenPacketData struct { - // the token denomination to be transferred - Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` - // the token amount to be transferred - Amount uint64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"` - // the sender address - Sender string `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` - // the recipient address on the destination chain - Receiver string `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"` -} - -func (m *FungibleTokenPacketData) Reset() { *m = FungibleTokenPacketData{} } -func (m *FungibleTokenPacketData) String() string { return proto.CompactTextString(m) } -func (*FungibleTokenPacketData) ProtoMessage() {} -func (*FungibleTokenPacketData) Descriptor() ([]byte, []int) { - return fileDescriptor_5041673e96e97901, []int{0} -} -func (m *FungibleTokenPacketData) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *FungibleTokenPacketData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_FungibleTokenPacketData.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 *FungibleTokenPacketData) XXX_Merge(src proto.Message) { - xxx_messageInfo_FungibleTokenPacketData.Merge(m, src) -} -func (m *FungibleTokenPacketData) XXX_Size() int { - return m.Size() -} -func (m *FungibleTokenPacketData) XXX_DiscardUnknown() { - xxx_messageInfo_FungibleTokenPacketData.DiscardUnknown(m) -} - -var xxx_messageInfo_FungibleTokenPacketData proto.InternalMessageInfo - -func (m *FungibleTokenPacketData) GetDenom() string { - if m != nil { - return m.Denom - } - return "" -} - -func (m *FungibleTokenPacketData) GetAmount() uint64 { - if m != nil { - return m.Amount - } - return 0 -} - -func (m *FungibleTokenPacketData) GetSender() string { - if m != nil { - return m.Sender - } - return "" -} - -func (m *FungibleTokenPacketData) GetReceiver() string { - if m != nil { - return m.Receiver - } - return "" -} - -// DenomTrace contains the base denomination for ICS20 fungible tokens and the -// source tracing information path. -type DenomTrace struct { - // path defines the chain of port/channel identifiers used for tracing the - // source of the fungible token. - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - // base denomination of the relayed fungible token. - BaseDenom string `protobuf:"bytes,2,opt,name=base_denom,json=baseDenom,proto3" json:"base_denom,omitempty"` -} - -func (m *DenomTrace) Reset() { *m = DenomTrace{} } -func (m *DenomTrace) String() string { return proto.CompactTextString(m) } -func (*DenomTrace) ProtoMessage() {} -func (*DenomTrace) Descriptor() ([]byte, []int) { - return fileDescriptor_5041673e96e97901, []int{1} -} -func (m *DenomTrace) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DenomTrace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DenomTrace.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 *DenomTrace) XXX_Merge(src proto.Message) { - xxx_messageInfo_DenomTrace.Merge(m, src) -} -func (m *DenomTrace) XXX_Size() int { - return m.Size() -} -func (m *DenomTrace) XXX_DiscardUnknown() { - xxx_messageInfo_DenomTrace.DiscardUnknown(m) -} - -var xxx_messageInfo_DenomTrace proto.InternalMessageInfo - -func (m *DenomTrace) GetPath() string { - if m != nil { - return m.Path - } - return "" -} - -func (m *DenomTrace) GetBaseDenom() string { - if m != nil { - return m.BaseDenom - } - return "" -} - -// Params defines the set of IBC transfer parameters. -// NOTE: To prevent a single token from being transferred, set the -// TransfersEnabled parameter to true and then set the bank module's SendEnabled -// parameter for the denomination to false. -type Params struct { - // send_enabled enables or disables all cross-chain token transfers from this - // chain. - SendEnabled bool `protobuf:"varint,1,opt,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty" yaml:"send_enabled"` - // receive_enabled enables or disables all cross-chain token transfers to this - // chain. - ReceiveEnabled bool `protobuf:"varint,2,opt,name=receive_enabled,json=receiveEnabled,proto3" json:"receive_enabled,omitempty" yaml:"receive_enabled"` -} - -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_5041673e96e97901, []int{2} -} -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 - -func (m *Params) GetSendEnabled() bool { - if m != nil { - return m.SendEnabled - } - return false -} - -func (m *Params) GetReceiveEnabled() bool { - if m != nil { - return m.ReceiveEnabled - } - return false -} - -func init() { - proto.RegisterType((*FungibleTokenPacketData)(nil), "ibc.applications.transfer.v1.FungibleTokenPacketData") - proto.RegisterType((*DenomTrace)(nil), "ibc.applications.transfer.v1.DenomTrace") - proto.RegisterType((*Params)(nil), "ibc.applications.transfer.v1.Params") -} - -func init() { - proto.RegisterFile("ibc/applications/transfer/v1/transfer.proto", fileDescriptor_5041673e96e97901) -} - -var fileDescriptor_5041673e96e97901 = []byte{ - // 362 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x6b, 0xe2, 0x40, - 0x14, 0xc7, 0x8d, 0xeb, 0x8a, 0xce, 0x2e, 0xbb, 0x30, 0x2b, 0x1a, 0x64, 0x1b, 0x25, 0x27, 0xa1, - 0x34, 0x41, 0x7a, 0xf3, 0xd0, 0x82, 0xb5, 0x3d, 0x4b, 0xf0, 0x50, 0x7a, 0x91, 0xc9, 0xe4, 0x35, - 0x06, 0x93, 0x99, 0x30, 0x33, 0x4a, 0xa5, 0x9f, 0xa0, 0xb7, 0x7e, 0xac, 0x1e, 0x3d, 0xf6, 0x24, - 0x45, 0xbf, 0x81, 0x9f, 0xa0, 0x64, 0x12, 0x82, 0x14, 0x7a, 0x9a, 0xf7, 0x7b, 0xef, 0xff, 0xff, - 0xcf, 0x83, 0x87, 0xce, 0x23, 0x9f, 0xba, 0x24, 0x4d, 0xe3, 0x88, 0x12, 0x15, 0x71, 0x26, 0x5d, - 0x25, 0x08, 0x93, 0x8f, 0x20, 0xdc, 0xf5, 0xb0, 0xac, 0x9d, 0x54, 0x70, 0xc5, 0xf1, 0xff, 0xc8, - 0xa7, 0xce, 0xa9, 0xd8, 0x29, 0x05, 0xeb, 0x61, 0xb7, 0x15, 0xf2, 0x90, 0x6b, 0xa1, 0x9b, 0x55, - 0xb9, 0xc7, 0x7e, 0x46, 0x9d, 0xbb, 0x15, 0x0b, 0x23, 0x3f, 0x86, 0x19, 0x5f, 0x02, 0x9b, 0x12, - 0xba, 0x04, 0x35, 0x21, 0x8a, 0xe0, 0x16, 0xfa, 0x19, 0x00, 0xe3, 0x89, 0x69, 0xf4, 0x8d, 0x41, - 0xd3, 0xcb, 0x01, 0xb7, 0x51, 0x9d, 0x24, 0x7c, 0xc5, 0x94, 0x59, 0xed, 0x1b, 0x83, 0x9a, 0x57, - 0x50, 0xd6, 0x97, 0xc0, 0x02, 0x10, 0xe6, 0x0f, 0x2d, 0x2f, 0x08, 0x77, 0x51, 0x43, 0x00, 0x85, - 0x68, 0x0d, 0xc2, 0xac, 0xe9, 0x49, 0xc9, 0xf6, 0x35, 0x42, 0x93, 0x2c, 0x74, 0x26, 0x08, 0x05, - 0x8c, 0x51, 0x2d, 0x25, 0x6a, 0x51, 0x7c, 0xa7, 0x6b, 0x7c, 0x86, 0x90, 0x4f, 0x24, 0xcc, 0xf3, - 0x45, 0xaa, 0x7a, 0xd2, 0xcc, 0x3a, 0xda, 0x67, 0xbf, 0x18, 0xa8, 0x3e, 0x25, 0x82, 0x24, 0x12, - 0x8f, 0xd0, 0xef, 0xec, 0xc7, 0x39, 0x30, 0xe2, 0xc7, 0x10, 0xe8, 0x94, 0xc6, 0xb8, 0x73, 0xdc, - 0xf5, 0xfe, 0x6d, 0x48, 0x12, 0x8f, 0xec, 0xd3, 0xa9, 0xed, 0xfd, 0xca, 0xf0, 0x36, 0x27, 0x7c, - 0x83, 0xfe, 0x16, 0x3b, 0x95, 0xf6, 0xaa, 0xb6, 0x77, 0x8f, 0xbb, 0x5e, 0x3b, 0xb7, 0x7f, 0x11, - 0xd8, 0xde, 0x9f, 0xa2, 0x53, 0x84, 0x8c, 0xef, 0xdf, 0xf6, 0x96, 0xb1, 0xdd, 0x5b, 0xc6, 0xc7, - 0xde, 0x32, 0x5e, 0x0f, 0x56, 0x65, 0x7b, 0xb0, 0x2a, 0xef, 0x07, 0xab, 0xf2, 0x70, 0x15, 0x46, - 0x6a, 0xb1, 0xf2, 0x1d, 0xca, 0x13, 0x97, 0x72, 0x99, 0x70, 0x59, 0x3c, 0x17, 0x32, 0x58, 0xba, - 0x4f, 0xee, 0xf7, 0x37, 0x56, 0x9b, 0x14, 0xa4, 0x5f, 0xd7, 0xa7, 0xba, 0xfc, 0x0c, 0x00, 0x00, - 0xff, 0xff, 0x46, 0x73, 0x85, 0x0b, 0x0d, 0x02, 0x00, 0x00, -} - -func (m *FungibleTokenPacketData) 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 *FungibleTokenPacketData) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *FungibleTokenPacketData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintTransfer(dAtA, i, uint64(len(m.Receiver))) - i-- - dAtA[i] = 0x22 - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintTransfer(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0x1a - } - if m.Amount != 0 { - i = encodeVarintTransfer(dAtA, i, uint64(m.Amount)) - i-- - dAtA[i] = 0x10 - } - if len(m.Denom) > 0 { - i -= len(m.Denom) - copy(dAtA[i:], m.Denom) - i = encodeVarintTransfer(dAtA, i, uint64(len(m.Denom))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *DenomTrace) 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 *DenomTrace) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DenomTrace) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.BaseDenom) > 0 { - i -= len(m.BaseDenom) - copy(dAtA[i:], m.BaseDenom) - i = encodeVarintTransfer(dAtA, i, uint64(len(m.BaseDenom))) - i-- - dAtA[i] = 0x12 - } - if len(m.Path) > 0 { - i -= len(m.Path) - copy(dAtA[i:], m.Path) - i = encodeVarintTransfer(dAtA, i, uint64(len(m.Path))) - 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 - if m.ReceiveEnabled { - i-- - if m.ReceiveEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } - if m.SendEnabled { - i-- - if m.SendEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintTransfer(dAtA []byte, offset int, v uint64) int { - offset -= sovTransfer(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *FungibleTokenPacketData) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Denom) - if l > 0 { - n += 1 + l + sovTransfer(uint64(l)) - } - if m.Amount != 0 { - n += 1 + sovTransfer(uint64(m.Amount)) - } - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovTransfer(uint64(l)) - } - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovTransfer(uint64(l)) - } - return n -} - -func (m *DenomTrace) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Path) - if l > 0 { - n += 1 + l + sovTransfer(uint64(l)) - } - l = len(m.BaseDenom) - if l > 0 { - n += 1 + l + sovTransfer(uint64(l)) - } - return n -} - -func (m *Params) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.SendEnabled { - n += 2 - } - if m.ReceiveEnabled { - n += 2 - } - return n -} - -func sovTransfer(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozTransfer(x uint64) (n int) { - return sovTransfer(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *FungibleTokenPacketData) 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 ErrIntOverflowTransfer - } - 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: FungibleTokenPacketData: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: FungibleTokenPacketData: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - 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 ErrInvalidLengthTransfer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTransfer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Denom = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) - } - m.Amount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Amount |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - 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 ErrInvalidLengthTransfer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTransfer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - 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 ErrInvalidLengthTransfer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTransfer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTransfer(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTransfer - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DenomTrace) 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 ErrIntOverflowTransfer - } - 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: DenomTrace: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DenomTrace: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Path", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - 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 ErrInvalidLengthTransfer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTransfer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Path = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BaseDenom", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - 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 ErrInvalidLengthTransfer - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTransfer - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.BaseDenom = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTransfer(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTransfer - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - 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 ErrIntOverflowTransfer - } - 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 != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SendEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.SendEnabled = bool(v != 0) - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ReceiveEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransfer - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.ReceiveEnabled = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipTransfer(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTransfer - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipTransfer(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, ErrIntOverflowTransfer - } - 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, ErrIntOverflowTransfer - } - 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, ErrIntOverflowTransfer - } - 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, ErrInvalidLengthTransfer - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTransfer - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthTransfer - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthTransfer = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTransfer = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupTransfer = fmt.Errorf("proto: unexpected end of group") -) diff --git a/applications/transfer/types/tx.pb.go b/applications/transfer/types/tx.pb.go deleted file mode 100644 index e3a630b4273..00000000000 --- a/applications/transfer/types/tx.pb.go +++ /dev/null @@ -1,804 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ibc/applications/transfer/v1/tx.proto - -package types - -import ( - context "context" - fmt "fmt" - types "github.com/cosmos/cosmos-sdk/types" - types1 "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/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 - -// MsgTransfer defines a msg to transfer fungible tokens (i.e Coins) between -// ICS20 enabled chains. See ICS Spec here: -// https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer#data-structures -type MsgTransfer struct { - // the port on which the packet will be sent - SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"` - // the channel by which the packet will be sent - SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"` - // the tokens to be transferred - Token types.Coin `protobuf:"bytes,3,opt,name=token,proto3" json:"token"` - // the sender address - Sender string `protobuf:"bytes,4,opt,name=sender,proto3" json:"sender,omitempty"` - // the recipient address on the destination chain - Receiver string `protobuf:"bytes,5,opt,name=receiver,proto3" json:"receiver,omitempty"` - // Timeout height relative to the current block height. - // The timeout is disabled when set to 0. - TimeoutHeight types1.Height `protobuf:"bytes,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"` - // Timeout timestamp (in nanoseconds) relative to the current block timestamp. - // The timeout is disabled when set to 0. - TimeoutTimestamp uint64 `protobuf:"varint,7,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"` -} - -func (m *MsgTransfer) Reset() { *m = MsgTransfer{} } -func (m *MsgTransfer) String() string { return proto.CompactTextString(m) } -func (*MsgTransfer) ProtoMessage() {} -func (*MsgTransfer) Descriptor() ([]byte, []int) { - return fileDescriptor_7401ed9bed2f8e09, []int{0} -} -func (m *MsgTransfer) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgTransfer.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 *MsgTransfer) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgTransfer.Merge(m, src) -} -func (m *MsgTransfer) XXX_Size() int { - return m.Size() -} -func (m *MsgTransfer) XXX_DiscardUnknown() { - xxx_messageInfo_MsgTransfer.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgTransfer proto.InternalMessageInfo - -// MsgTransferResponse defines the Msg/Transfer response type. -type MsgTransferResponse struct { -} - -func (m *MsgTransferResponse) Reset() { *m = MsgTransferResponse{} } -func (m *MsgTransferResponse) String() string { return proto.CompactTextString(m) } -func (*MsgTransferResponse) ProtoMessage() {} -func (*MsgTransferResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_7401ed9bed2f8e09, []int{1} -} -func (m *MsgTransferResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgTransferResponse.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 *MsgTransferResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgTransferResponse.Merge(m, src) -} -func (m *MsgTransferResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgTransferResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgTransferResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgTransferResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*MsgTransfer)(nil), "ibc.applications.transfer.v1.MsgTransfer") - proto.RegisterType((*MsgTransferResponse)(nil), "ibc.applications.transfer.v1.MsgTransferResponse") -} - -func init() { - proto.RegisterFile("ibc/applications/transfer/v1/tx.proto", fileDescriptor_7401ed9bed2f8e09) -} - -var fileDescriptor_7401ed9bed2f8e09 = []byte{ - // 488 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0x13, 0xd6, 0x95, 0xe2, 0x6a, 0x13, 0x18, 0x36, 0x65, 0xd5, 0x48, 0xaa, 0x48, 0x48, - 0xe5, 0x80, 0xad, 0x0c, 0x21, 0xa4, 0x1d, 0x10, 0xca, 0x2e, 0x70, 0x98, 0x84, 0xa2, 0x1d, 0x10, - 0x97, 0x91, 0x78, 0x26, 0xb1, 0xd6, 0xd8, 0x91, 0xed, 0x46, 0xdb, 0x37, 0xe0, 0xc8, 0x47, 0xd8, - 0x99, 0x4f, 0xb2, 0xe3, 0x8e, 0x9c, 0x2a, 0xd4, 0x5e, 0x38, 0xf7, 0x13, 0xa0, 0xc4, 0x6e, 0x69, - 0x0f, 0x20, 0x4e, 0xf1, 0x7b, 0xff, 0xdf, 0xf3, 0x5f, 0xcf, 0xef, 0x05, 0x3c, 0x63, 0x19, 0xc1, - 0x69, 0x55, 0x8d, 0x19, 0x49, 0x35, 0x13, 0x5c, 0x61, 0x2d, 0x53, 0xae, 0xbe, 0x50, 0x89, 0xeb, - 0x08, 0xeb, 0x2b, 0x54, 0x49, 0xa1, 0x05, 0x3c, 0x64, 0x19, 0x41, 0xeb, 0x18, 0x5a, 0x62, 0xa8, - 0x8e, 0x06, 0x4f, 0x72, 0x91, 0x8b, 0x16, 0xc4, 0xcd, 0xc9, 0xd4, 0x0c, 0x7c, 0x22, 0x54, 0x29, - 0x14, 0xce, 0x52, 0x45, 0x71, 0x1d, 0x65, 0x54, 0xa7, 0x11, 0x26, 0x82, 0x71, 0xab, 0x07, 0x8d, - 0x35, 0x11, 0x92, 0x62, 0x32, 0x66, 0x94, 0xeb, 0xc6, 0xd0, 0x9c, 0x0c, 0x10, 0x7e, 0xdf, 0x02, - 0xfd, 0x53, 0x95, 0x9f, 0x59, 0x27, 0xf8, 0x1a, 0xf4, 0x95, 0x98, 0x48, 0x42, 0xcf, 0x2b, 0x21, - 0xb5, 0xe7, 0x0e, 0xdd, 0xd1, 0x83, 0x78, 0x7f, 0x31, 0x0d, 0xe0, 0x75, 0x5a, 0x8e, 0x8f, 0xc3, - 0x35, 0x31, 0x4c, 0x80, 0x89, 0x3e, 0x08, 0xa9, 0xe1, 0x5b, 0xb0, 0x6b, 0x35, 0x52, 0xa4, 0x9c, - 0xd3, 0xb1, 0x77, 0xaf, 0xad, 0x3d, 0x58, 0x4c, 0x83, 0xbd, 0x8d, 0x5a, 0xab, 0x87, 0xc9, 0x8e, - 0x49, 0x9c, 0x98, 0x18, 0xbe, 0x02, 0xdb, 0x5a, 0x5c, 0x52, 0xee, 0x6d, 0x0d, 0xdd, 0x51, 0xff, - 0xe8, 0x00, 0x99, 0xde, 0x50, 0xd3, 0x1b, 0xb2, 0xbd, 0xa1, 0x13, 0xc1, 0x78, 0xdc, 0xb9, 0x9d, - 0x06, 0x4e, 0x62, 0x68, 0xb8, 0x0f, 0xba, 0x8a, 0xf2, 0x0b, 0x2a, 0xbd, 0x4e, 0x63, 0x98, 0xd8, - 0x08, 0x0e, 0x40, 0x4f, 0x52, 0x42, 0x59, 0x4d, 0xa5, 0xb7, 0xdd, 0x2a, 0xab, 0x18, 0x7e, 0x06, - 0xbb, 0x9a, 0x95, 0x54, 0x4c, 0xf4, 0x79, 0x41, 0x59, 0x5e, 0x68, 0xaf, 0xdb, 0x7a, 0x0e, 0x50, - 0x33, 0x83, 0xe6, 0xbd, 0x90, 0x7d, 0xa5, 0x3a, 0x42, 0xef, 0x5a, 0x22, 0x7e, 0xda, 0x98, 0xfe, - 0x69, 0x66, 0xb3, 0x3e, 0x4c, 0x76, 0x6c, 0xc2, 0xd0, 0xf0, 0x3d, 0x78, 0xb4, 0x24, 0x9a, 0xaf, - 0xd2, 0x69, 0x59, 0x79, 0xf7, 0x87, 0xee, 0xa8, 0x13, 0x1f, 0x2e, 0xa6, 0x81, 0xb7, 0x79, 0xc9, - 0x0a, 0x09, 0x93, 0x87, 0x36, 0x77, 0xb6, 0x4c, 0x1d, 0xf7, 0xbe, 0xde, 0x04, 0xce, 0xaf, 0x9b, - 0xc0, 0x09, 0xf7, 0xc0, 0xe3, 0xb5, 0x59, 0x25, 0x54, 0x55, 0x82, 0x2b, 0x7a, 0x24, 0xc0, 0xd6, - 0xa9, 0xca, 0x61, 0x01, 0x7a, 0xab, 0x31, 0x3e, 0x47, 0xff, 0x5a, 0x26, 0xb4, 0x76, 0xcb, 0x20, - 0xfa, 0x6f, 0x74, 0x69, 0x18, 0x7f, 0xbc, 0x9d, 0xf9, 0xee, 0xdd, 0xcc, 0x77, 0x7f, 0xce, 0x7c, - 0xf7, 0xdb, 0xdc, 0x77, 0xee, 0xe6, 0xbe, 0xf3, 0x63, 0xee, 0x3b, 0x9f, 0xde, 0xe4, 0x4c, 0x17, - 0x93, 0x0c, 0x11, 0x51, 0x62, 0xbb, 0x9a, 0xe6, 0xf3, 0x42, 0x5d, 0x5c, 0xe2, 0x2b, 0xfc, 0xf7, - 0x3f, 0x41, 0x5f, 0x57, 0x54, 0x65, 0xdd, 0x76, 0x2b, 0x5f, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, - 0x26, 0x76, 0x5b, 0xfa, 0x33, 0x03, 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 { - // Transfer defines a rpc handler method for MsgTransfer. - Transfer(ctx context.Context, in *MsgTransfer, opts ...grpc.CallOption) (*MsgTransferResponse, error) -} - -type msgClient struct { - cc grpc1.ClientConn -} - -func NewMsgClient(cc grpc1.ClientConn) MsgClient { - return &msgClient{cc} -} - -func (c *msgClient) Transfer(ctx context.Context, in *MsgTransfer, opts ...grpc.CallOption) (*MsgTransferResponse, error) { - out := new(MsgTransferResponse) - err := c.cc.Invoke(ctx, "/ibc.applications.transfer.v1.Msg/Transfer", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// MsgServer is the server API for Msg service. -type MsgServer interface { - // Transfer defines a rpc handler method for MsgTransfer. - Transfer(context.Context, *MsgTransfer) (*MsgTransferResponse, error) -} - -// UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct { -} - -func (*UnimplementedMsgServer) Transfer(ctx context.Context, req *MsgTransfer) (*MsgTransferResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Transfer not implemented") -} - -func RegisterMsgServer(s grpc1.Server, srv MsgServer) { - s.RegisterService(&_Msg_serviceDesc, srv) -} - -func _Msg_Transfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgTransfer) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).Transfer(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ibc.applications.transfer.v1.Msg/Transfer", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).Transfer(ctx, req.(*MsgTransfer)) - } - return interceptor(ctx, in, info, handler) -} - -var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "ibc.applications.transfer.v1.Msg", - HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Transfer", - Handler: _Msg_Transfer_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "ibc/applications/transfer/v1/tx.proto", -} - -func (m *MsgTransfer) 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 *MsgTransfer) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.TimeoutTimestamp != 0 { - i = encodeVarintTx(dAtA, i, uint64(m.TimeoutTimestamp)) - i-- - dAtA[i] = 0x38 - } - { - size, err := m.TimeoutHeight.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintTx(dAtA, i, uint64(len(m.Receiver))) - i-- - dAtA[i] = 0x2a - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintTx(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0x22 - } - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - if len(m.SourceChannel) > 0 { - i -= len(m.SourceChannel) - copy(dAtA[i:], m.SourceChannel) - i = encodeVarintTx(dAtA, i, uint64(len(m.SourceChannel))) - i-- - dAtA[i] = 0x12 - } - if len(m.SourcePort) > 0 { - i -= len(m.SourcePort) - copy(dAtA[i:], m.SourcePort) - i = encodeVarintTx(dAtA, i, uint64(len(m.SourcePort))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgTransferResponse) 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 *MsgTransferResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgTransferResponse) 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 *MsgTransfer) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.SourcePort) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.SourceChannel) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = m.Token.Size() - n += 1 + l + sovTx(uint64(l)) - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = m.TimeoutHeight.Size() - n += 1 + l + sovTx(uint64(l)) - if m.TimeoutTimestamp != 0 { - n += 1 + sovTx(uint64(m.TimeoutTimestamp)) - } - return n -} - -func (m *MsgTransferResponse) 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 *MsgTransfer) 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: MsgTransfer: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgTransfer: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SourcePort", 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.SourcePort = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SourceChannel", 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.SourceChannel = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", 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.Token.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", 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.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", 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.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutHeight", 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.TimeoutHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutTimestamp", wireType) - } - m.TimeoutTimestamp = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TimeoutTimestamp |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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 *MsgTransferResponse) 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: MsgTransferResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgTransferResponse: 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/applications/transfer/client/cli/cli.go b/apps/transfer/client/cli/cli.go similarity index 100% rename from applications/transfer/client/cli/cli.go rename to apps/transfer/client/cli/cli.go diff --git a/applications/transfer/client/cli/query.go b/apps/transfer/client/cli/query.go similarity index 97% rename from applications/transfer/client/cli/query.go rename to apps/transfer/client/cli/query.go index b9658e05ae9..d6123e425be 100644 --- a/applications/transfer/client/cli/query.go +++ b/apps/transfer/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // GetCmdQueryDenomTrace defines the command to query a a denomination trace from a given hash. diff --git a/applications/transfer/client/cli/tx.go b/apps/transfer/client/cli/tx.go similarity index 94% rename from applications/transfer/client/cli/tx.go rename to apps/transfer/client/cli/tx.go index 1f9e92f63ca..9eafea9a937 100644 --- a/applications/transfer/client/cli/tx.go +++ b/apps/transfer/client/cli/tx.go @@ -12,9 +12,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channelutils "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/client/utils" + "github.com/cosmos/ibc-go/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channelutils "github.com/cosmos/ibc-go/core/04-channel/client/utils" ) const ( diff --git a/applications/transfer/handler.go b/apps/transfer/handler.go similarity index 90% rename from applications/transfer/handler.go rename to apps/transfer/handler.go index 7c992c920e7..58ad69fd95d 100644 --- a/applications/transfer/handler.go +++ b/apps/transfer/handler.go @@ -3,7 +3,7 @@ package transfer import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // NewHandler returns sdk.Handler for IBC token transfer module messages diff --git a/applications/transfer/handler_test.go b/apps/transfer/handler_test.go similarity index 95% rename from applications/transfer/handler_test.go rename to apps/transfer/handler_test.go index 92a04210115..584b4a32ea1 100644 --- a/applications/transfer/handler_test.go +++ b/apps/transfer/handler_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/suite" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) type TransferTestSuite struct { diff --git a/applications/transfer/keeper/MBT_README.md b/apps/transfer/keeper/MBT_README.md similarity index 100% rename from applications/transfer/keeper/MBT_README.md rename to apps/transfer/keeper/MBT_README.md diff --git a/applications/transfer/keeper/encoding.go b/apps/transfer/keeper/encoding.go similarity index 94% rename from applications/transfer/keeper/encoding.go rename to apps/transfer/keeper/encoding.go index ddb1bc4b0c5..1f6e7e63c5f 100644 --- a/applications/transfer/keeper/encoding.go +++ b/apps/transfer/keeper/encoding.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // UnmarshalDenomTrace attempts to decode and return an DenomTrace object from diff --git a/applications/transfer/keeper/genesis.go b/apps/transfer/keeper/genesis.go similarity index 94% rename from applications/transfer/keeper/genesis.go rename to apps/transfer/keeper/genesis.go index 58a0c081157..1c7aaef88b9 100644 --- a/applications/transfer/keeper/genesis.go +++ b/apps/transfer/keeper/genesis.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // InitGenesis initializes the ibc-transfer state and binds to PortID. diff --git a/applications/transfer/keeper/genesis_test.go b/apps/transfer/keeper/genesis_test.go similarity index 92% rename from applications/transfer/keeper/genesis_test.go rename to apps/transfer/keeper/genesis_test.go index a85434911fb..ad708004c9c 100644 --- a/applications/transfer/keeper/genesis_test.go +++ b/apps/transfer/keeper/genesis_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "fmt" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) func (suite *KeeperTestSuite) TestGenesis() { diff --git a/applications/transfer/keeper/grpc_query.go b/apps/transfer/keeper/grpc_query.go similarity index 96% rename from applications/transfer/keeper/grpc_query.go rename to apps/transfer/keeper/grpc_query.go index b6347895b42..0865658715d 100644 --- a/applications/transfer/keeper/grpc_query.go +++ b/apps/transfer/keeper/grpc_query.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) var _ types.QueryServer = Keeper{} diff --git a/applications/transfer/keeper/grpc_query_test.go b/apps/transfer/keeper/grpc_query_test.go similarity index 97% rename from applications/transfer/keeper/grpc_query_test.go rename to apps/transfer/keeper/grpc_query_test.go index 0b16e0726b5..c297ea9dfa9 100644 --- a/applications/transfer/keeper/grpc_query_test.go +++ b/apps/transfer/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) func (suite *KeeperTestSuite) TestQueryDenomTrace() { diff --git a/applications/transfer/keeper/keeper.go b/apps/transfer/keeper/keeper.go similarity index 96% rename from applications/transfer/keeper/keeper.go rename to apps/transfer/keeper/keeper.go index a2eebb55e1e..fbc4a167f4f 100644 --- a/applications/transfer/keeper/keeper.go +++ b/apps/transfer/keeper/keeper.go @@ -11,9 +11,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/applications/transfer/keeper/keeper_test.go b/apps/transfer/keeper/keeper_test.go similarity index 92% rename from applications/transfer/keeper/keeper_test.go rename to apps/transfer/keeper/keeper_test.go index cce9cbccae4..f7f01038cb6 100644 --- a/applications/transfer/keeper/keeper_test.go +++ b/apps/transfer/keeper/keeper_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/apps/transfer/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) type KeeperTestSuite struct { diff --git a/applications/transfer/keeper/mbt_relay_test.go b/apps/transfer/keeper/mbt_relay_test.go similarity index 97% rename from applications/transfer/keeper/mbt_relay_test.go rename to apps/transfer/keeper/mbt_relay_test.go index cd64fbabc25..52205088e19 100644 --- a/applications/transfer/keeper/mbt_relay_test.go +++ b/apps/transfer/keeper/mbt_relay_test.go @@ -15,11 +15,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) type TlaBalance struct { diff --git a/applications/transfer/keeper/model_based_tests/Test5Packets.json b/apps/transfer/keeper/model_based_tests/Test5Packets.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/Test5Packets.json rename to apps/transfer/keeper/model_based_tests/Test5Packets.json diff --git a/applications/transfer/keeper/model_based_tests/Test5Packets.tla b/apps/transfer/keeper/model_based_tests/Test5Packets.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/Test5Packets.tla rename to apps/transfer/keeper/model_based_tests/Test5Packets.tla diff --git a/applications/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.json b/apps/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.json rename to apps/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.json diff --git a/applications/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.tla b/apps/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.tla rename to apps/transfer/keeper/model_based_tests/Test5PacketsAllDifferentPass.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.json b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.json rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.tla b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.tla rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorFail.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.json b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.json rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.tla b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.tla rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementErrorPass.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.json b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.json rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.tla b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.tla rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultFail.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.json b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.json rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.tla b/apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.tla rename to apps/transfer/keeper/model_based_tests/TestOnRecvAcknowledgementResultPass.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvPacketFail.json b/apps/transfer/keeper/model_based_tests/TestOnRecvPacketFail.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvPacketFail.json rename to apps/transfer/keeper/model_based_tests/TestOnRecvPacketFail.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvPacketFail.tla b/apps/transfer/keeper/model_based_tests/TestOnRecvPacketFail.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvPacketFail.tla rename to apps/transfer/keeper/model_based_tests/TestOnRecvPacketFail.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvPacketPass.json b/apps/transfer/keeper/model_based_tests/TestOnRecvPacketPass.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvPacketPass.json rename to apps/transfer/keeper/model_based_tests/TestOnRecvPacketPass.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnRecvPacketPass.tla b/apps/transfer/keeper/model_based_tests/TestOnRecvPacketPass.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnRecvPacketPass.tla rename to apps/transfer/keeper/model_based_tests/TestOnRecvPacketPass.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnTimeoutFail.json b/apps/transfer/keeper/model_based_tests/TestOnTimeoutFail.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnTimeoutFail.json rename to apps/transfer/keeper/model_based_tests/TestOnTimeoutFail.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnTimeoutFail.tla b/apps/transfer/keeper/model_based_tests/TestOnTimeoutFail.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnTimeoutFail.tla rename to apps/transfer/keeper/model_based_tests/TestOnTimeoutFail.tla diff --git a/applications/transfer/keeper/model_based_tests/TestOnTimeoutPass.json b/apps/transfer/keeper/model_based_tests/TestOnTimeoutPass.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnTimeoutPass.json rename to apps/transfer/keeper/model_based_tests/TestOnTimeoutPass.json diff --git a/applications/transfer/keeper/model_based_tests/TestOnTimeoutPass.tla b/apps/transfer/keeper/model_based_tests/TestOnTimeoutPass.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestOnTimeoutPass.tla rename to apps/transfer/keeper/model_based_tests/TestOnTimeoutPass.tla diff --git a/applications/transfer/keeper/model_based_tests/TestSendTransferFail.json b/apps/transfer/keeper/model_based_tests/TestSendTransferFail.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestSendTransferFail.json rename to apps/transfer/keeper/model_based_tests/TestSendTransferFail.json diff --git a/applications/transfer/keeper/model_based_tests/TestSendTransferFail.tla b/apps/transfer/keeper/model_based_tests/TestSendTransferFail.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestSendTransferFail.tla rename to apps/transfer/keeper/model_based_tests/TestSendTransferFail.tla diff --git a/applications/transfer/keeper/model_based_tests/TestSendTransferPass.json b/apps/transfer/keeper/model_based_tests/TestSendTransferPass.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestSendTransferPass.json rename to apps/transfer/keeper/model_based_tests/TestSendTransferPass.json diff --git a/applications/transfer/keeper/model_based_tests/TestSendTransferPass.tla b/apps/transfer/keeper/model_based_tests/TestSendTransferPass.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestSendTransferPass.tla rename to apps/transfer/keeper/model_based_tests/TestSendTransferPass.tla diff --git a/applications/transfer/keeper/model_based_tests/TestUnescrowTokens.json b/apps/transfer/keeper/model_based_tests/TestUnescrowTokens.json similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestUnescrowTokens.json rename to apps/transfer/keeper/model_based_tests/TestUnescrowTokens.json diff --git a/applications/transfer/keeper/model_based_tests/TestUnescrowTokens.tla b/apps/transfer/keeper/model_based_tests/TestUnescrowTokens.tla similarity index 100% rename from applications/transfer/keeper/model_based_tests/TestUnescrowTokens.tla rename to apps/transfer/keeper/model_based_tests/TestUnescrowTokens.tla diff --git a/applications/transfer/keeper/msg_server.go b/apps/transfer/keeper/msg_server.go similarity index 95% rename from applications/transfer/keeper/msg_server.go rename to apps/transfer/keeper/msg_server.go index dd2999af341..4c658434720 100644 --- a/applications/transfer/keeper/msg_server.go +++ b/apps/transfer/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) var _ types.MsgServer = Keeper{} diff --git a/applications/transfer/keeper/params.go b/apps/transfer/keeper/params.go similarity index 92% rename from applications/transfer/keeper/params.go rename to apps/transfer/keeper/params.go index 39a6c5d53de..1d5a9d0c2dc 100644 --- a/applications/transfer/keeper/params.go +++ b/apps/transfer/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // GetSendEnabled retrieves the send enabled boolean from the paramstore diff --git a/applications/transfer/keeper/params_test.go b/apps/transfer/keeper/params_test.go similarity index 86% rename from applications/transfer/keeper/params_test.go rename to apps/transfer/keeper/params_test.go index 96f17ff7f1c..464ce3000b9 100644 --- a/applications/transfer/keeper/params_test.go +++ b/apps/transfer/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" +import "github.com/cosmos/ibc-go/apps/transfer/types" func (suite *KeeperTestSuite) TestParams() { expParams := types.DefaultParams() diff --git a/applications/transfer/keeper/relay.go b/apps/transfer/keeper/relay.go similarity index 98% rename from applications/transfer/keeper/relay.go rename to apps/transfer/keeper/relay.go index 4889014a40a..56b0489e5c7 100644 --- a/applications/transfer/keeper/relay.go +++ b/apps/transfer/keeper/relay.go @@ -9,10 +9,10 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" ) // SendTransfer handles transfer sending logic. There are 2 possible cases: diff --git a/applications/transfer/keeper/relay_model/account.tla b/apps/transfer/keeper/relay_model/account.tla similarity index 100% rename from applications/transfer/keeper/relay_model/account.tla rename to apps/transfer/keeper/relay_model/account.tla diff --git a/applications/transfer/keeper/relay_model/account_record.tla b/apps/transfer/keeper/relay_model/account_record.tla similarity index 100% rename from applications/transfer/keeper/relay_model/account_record.tla rename to apps/transfer/keeper/relay_model/account_record.tla diff --git a/applications/transfer/keeper/relay_model/apalache-to-relay-test.json b/apps/transfer/keeper/relay_model/apalache-to-relay-test.json similarity index 100% rename from applications/transfer/keeper/relay_model/apalache-to-relay-test.json rename to apps/transfer/keeper/relay_model/apalache-to-relay-test.json diff --git a/applications/transfer/keeper/relay_model/apalache-to-relay-test2.json b/apps/transfer/keeper/relay_model/apalache-to-relay-test2.json similarity index 100% rename from applications/transfer/keeper/relay_model/apalache-to-relay-test2.json rename to apps/transfer/keeper/relay_model/apalache-to-relay-test2.json diff --git a/applications/transfer/keeper/relay_model/denom.tla b/apps/transfer/keeper/relay_model/denom.tla similarity index 100% rename from applications/transfer/keeper/relay_model/denom.tla rename to apps/transfer/keeper/relay_model/denom.tla diff --git a/applications/transfer/keeper/relay_model/denom_record.tla b/apps/transfer/keeper/relay_model/denom_record.tla similarity index 100% rename from applications/transfer/keeper/relay_model/denom_record.tla rename to apps/transfer/keeper/relay_model/denom_record.tla diff --git a/applications/transfer/keeper/relay_model/denom_record2.tla b/apps/transfer/keeper/relay_model/denom_record2.tla similarity index 100% rename from applications/transfer/keeper/relay_model/denom_record2.tla rename to apps/transfer/keeper/relay_model/denom_record2.tla diff --git a/applications/transfer/keeper/relay_model/denom_sequence.tla b/apps/transfer/keeper/relay_model/denom_sequence.tla similarity index 100% rename from applications/transfer/keeper/relay_model/denom_sequence.tla rename to apps/transfer/keeper/relay_model/denom_sequence.tla diff --git a/applications/transfer/keeper/relay_model/identifiers.tla b/apps/transfer/keeper/relay_model/identifiers.tla similarity index 100% rename from applications/transfer/keeper/relay_model/identifiers.tla rename to apps/transfer/keeper/relay_model/identifiers.tla diff --git a/applications/transfer/keeper/relay_model/relay.tla b/apps/transfer/keeper/relay_model/relay.tla similarity index 100% rename from applications/transfer/keeper/relay_model/relay.tla rename to apps/transfer/keeper/relay_model/relay.tla diff --git a/applications/transfer/keeper/relay_model/relay_tests.tla b/apps/transfer/keeper/relay_model/relay_tests.tla similarity index 100% rename from applications/transfer/keeper/relay_model/relay_tests.tla rename to apps/transfer/keeper/relay_model/relay_tests.tla diff --git a/applications/transfer/keeper/relay_test.go b/apps/transfer/keeper/relay_test.go similarity index 97% rename from applications/transfer/keeper/relay_test.go rename to apps/transfer/keeper/relay_test.go index 89058ac2952..32cacd73832 100644 --- a/applications/transfer/keeper/relay_test.go +++ b/apps/transfer/keeper/relay_test.go @@ -6,12 +6,12 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) // test sending from chainA to chainB using both coin that orignate on diff --git a/applications/transfer/module.go b/apps/transfer/module.go similarity index 96% rename from applications/transfer/module.go rename to apps/transfer/module.go index 25290d69a64..450e2fca5bb 100644 --- a/applications/transfer/module.go +++ b/apps/transfer/module.go @@ -22,13 +22,13 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/apps/transfer/client/cli" + "github.com/cosmos/ibc-go/apps/transfer/keeper" + "github.com/cosmos/ibc-go/apps/transfer/simulation" + "github.com/cosmos/ibc-go/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/core/05-port/types" + host "github.com/cosmos/ibc-go/core/24-host" ) var ( diff --git a/applications/transfer/module_test.go b/apps/transfer/module_test.go similarity index 95% rename from applications/transfer/module_test.go rename to apps/transfer/module_test.go index d2acfb40431..c316341ebf5 100644 --- a/applications/transfer/module_test.go +++ b/apps/transfer/module_test.go @@ -4,11 +4,11 @@ import ( "math" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *TransferTestSuite) TestOnChanOpenInit() { diff --git a/applications/transfer/simulation/decoder.go b/apps/transfer/simulation/decoder.go similarity index 93% rename from applications/transfer/simulation/decoder.go rename to apps/transfer/simulation/decoder.go index df783450388..70191c6a2b8 100644 --- a/applications/transfer/simulation/decoder.go +++ b/apps/transfer/simulation/decoder.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // TransferUnmarshaler defines the expected encoding store functions. diff --git a/applications/transfer/simulation/decoder_test.go b/apps/transfer/simulation/decoder_test.go similarity index 90% rename from applications/transfer/simulation/decoder_test.go rename to apps/transfer/simulation/decoder_test.go index 729a067e028..a71f399746e 100644 --- a/applications/transfer/simulation/decoder_test.go +++ b/apps/transfer/simulation/decoder_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/simulation" + "github.com/cosmos/ibc-go/apps/transfer/types" ) func TestDecodeStore(t *testing.T) { diff --git a/applications/transfer/simulation/genesis.go b/apps/transfer/simulation/genesis.go similarity index 95% rename from applications/transfer/simulation/genesis.go rename to apps/transfer/simulation/genesis.go index a51bce9f471..647f232109d 100644 --- a/applications/transfer/simulation/genesis.go +++ b/apps/transfer/simulation/genesis.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // Simulation parameter constants diff --git a/applications/transfer/simulation/genesis_test.go b/apps/transfer/simulation/genesis_test.go similarity index 94% rename from applications/transfer/simulation/genesis_test.go rename to apps/transfer/simulation/genesis_test.go index 12791d7445f..9cac5ab3fd1 100644 --- a/applications/transfer/simulation/genesis_test.go +++ b/apps/transfer/simulation/genesis_test.go @@ -11,8 +11,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/simulation" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/applications/transfer/simulation/params.go b/apps/transfer/simulation/params.go similarity index 93% rename from applications/transfer/simulation/params.go rename to apps/transfer/simulation/params.go index 67c61f514ed..29f84d6c32a 100644 --- a/applications/transfer/simulation/params.go +++ b/apps/transfer/simulation/params.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // ParamChanges defines the parameters that can be modified by param change proposals diff --git a/applications/transfer/simulation/params_test.go b/apps/transfer/simulation/params_test.go similarity index 91% rename from applications/transfer/simulation/params_test.go rename to apps/transfer/simulation/params_test.go index a692d4328e9..71e4a815184 100644 --- a/applications/transfer/simulation/params_test.go +++ b/apps/transfer/simulation/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation" + "github.com/cosmos/ibc-go/apps/transfer/simulation" ) func TestParamChanges(t *testing.T) { diff --git a/applications/transfer/spec/01_concepts.md b/apps/transfer/spec/01_concepts.md similarity index 100% rename from applications/transfer/spec/01_concepts.md rename to apps/transfer/spec/01_concepts.md diff --git a/applications/transfer/spec/02_state.md b/apps/transfer/spec/02_state.md similarity index 100% rename from applications/transfer/spec/02_state.md rename to apps/transfer/spec/02_state.md diff --git a/applications/transfer/spec/03_state_transitions.md b/apps/transfer/spec/03_state_transitions.md similarity index 100% rename from applications/transfer/spec/03_state_transitions.md rename to apps/transfer/spec/03_state_transitions.md diff --git a/applications/transfer/spec/04_messages.md b/apps/transfer/spec/04_messages.md similarity index 100% rename from applications/transfer/spec/04_messages.md rename to apps/transfer/spec/04_messages.md diff --git a/applications/transfer/spec/05_events.md b/apps/transfer/spec/05_events.md similarity index 100% rename from applications/transfer/spec/05_events.md rename to apps/transfer/spec/05_events.md diff --git a/applications/transfer/spec/06_metrics.md b/apps/transfer/spec/06_metrics.md similarity index 100% rename from applications/transfer/spec/06_metrics.md rename to apps/transfer/spec/06_metrics.md diff --git a/applications/transfer/spec/07_params.md b/apps/transfer/spec/07_params.md similarity index 100% rename from applications/transfer/spec/07_params.md rename to apps/transfer/spec/07_params.md diff --git a/applications/transfer/spec/README.md b/apps/transfer/spec/README.md similarity index 100% rename from applications/transfer/spec/README.md rename to apps/transfer/spec/README.md diff --git a/applications/transfer/types/codec.go b/apps/transfer/types/codec.go similarity index 100% rename from applications/transfer/types/codec.go rename to apps/transfer/types/codec.go diff --git a/applications/transfer/types/coin.go b/apps/transfer/types/coin.go similarity index 100% rename from applications/transfer/types/coin.go rename to apps/transfer/types/coin.go diff --git a/applications/transfer/types/errors.go b/apps/transfer/types/errors.go similarity index 100% rename from applications/transfer/types/errors.go rename to apps/transfer/types/errors.go diff --git a/applications/transfer/types/events.go b/apps/transfer/types/events.go similarity index 100% rename from applications/transfer/types/events.go rename to apps/transfer/types/events.go diff --git a/applications/transfer/types/expected_keepers.go b/apps/transfer/types/expected_keepers.go similarity index 90% rename from applications/transfer/types/expected_keepers.go rename to apps/transfer/types/expected_keepers.go index 284463350ef..6087855c709 100644 --- a/applications/transfer/types/expected_keepers.go +++ b/apps/transfer/types/expected_keepers.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/core/exported" ) // AccountKeeper defines the contract required for account APIs. diff --git a/applications/transfer/types/genesis.go b/apps/transfer/types/genesis.go similarity index 93% rename from applications/transfer/types/genesis.go rename to apps/transfer/types/genesis.go index 682b04c4cf0..6432f3a7f2d 100644 --- a/applications/transfer/types/genesis.go +++ b/apps/transfer/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) // NewGenesisState creates a new ibc-transfer GenesisState instance. diff --git a/applications/transfer/types/genesis_test.go b/apps/transfer/types/genesis_test.go similarity index 91% rename from applications/transfer/types/genesis_test.go rename to apps/transfer/types/genesis_test.go index a2aba58ca67..bac4c35d7dd 100644 --- a/applications/transfer/types/genesis_test.go +++ b/apps/transfer/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) func TestValidateGenesis(t *testing.T) { diff --git a/applications/transfer/types/keys.go b/apps/transfer/types/keys.go similarity index 100% rename from applications/transfer/types/keys.go rename to apps/transfer/types/keys.go diff --git a/applications/transfer/types/keys_test.go b/apps/transfer/types/keys_test.go similarity index 88% rename from applications/transfer/types/keys_test.go rename to apps/transfer/types/keys_test.go index 9ab3314c2e3..3096fec7b56 100644 --- a/applications/transfer/types/keys_test.go +++ b/apps/transfer/types/keys_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + "github.com/cosmos/ibc-go/apps/transfer/types" ) // Test that there is domain separation between the port id and the channel id otherwise an diff --git a/applications/transfer/types/msgs.go b/apps/transfer/types/msgs.go similarity index 95% rename from applications/transfer/types/msgs.go rename to apps/transfer/types/msgs.go index cf2293213a8..568c3d8d2f5 100644 --- a/applications/transfer/types/msgs.go +++ b/apps/transfer/types/msgs.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" ) // msg types diff --git a/applications/transfer/types/msgs_test.go b/apps/transfer/types/msgs_test.go similarity index 98% rename from applications/transfer/types/msgs_test.go rename to apps/transfer/types/msgs_test.go index 1fc70c543bb..e059886967b 100644 --- a/applications/transfer/types/msgs_test.go +++ b/apps/transfer/types/msgs_test.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" ) // define constants used for testing diff --git a/applications/transfer/types/packet.go b/apps/transfer/types/packet.go similarity index 100% rename from applications/transfer/types/packet.go rename to apps/transfer/types/packet.go diff --git a/applications/transfer/types/packet_test.go b/apps/transfer/types/packet_test.go similarity index 100% rename from applications/transfer/types/packet_test.go rename to apps/transfer/types/packet_test.go diff --git a/applications/transfer/types/params.go b/apps/transfer/types/params.go similarity index 100% rename from applications/transfer/types/params.go rename to apps/transfer/types/params.go diff --git a/applications/transfer/types/params_test.go b/apps/transfer/types/params_test.go similarity index 100% rename from applications/transfer/types/params_test.go rename to apps/transfer/types/params_test.go diff --git a/applications/transfer/types/trace.go b/apps/transfer/types/trace.go similarity index 99% rename from applications/transfer/types/trace.go rename to apps/transfer/types/trace.go index f45113efa3f..cc19a4c43f1 100644 --- a/applications/transfer/types/trace.go +++ b/apps/transfer/types/trace.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) // ParseDenomTrace parses a string with the ibc prefix (denom trace) and the base denomination diff --git a/applications/transfer/types/trace_test.go b/apps/transfer/types/trace_test.go similarity index 100% rename from applications/transfer/types/trace_test.go rename to apps/transfer/types/trace_test.go diff --git a/core/02-client/abci.go b/core/02-client/abci.go index 3c56d90ad37..b65fb3c60ea 100644 --- a/core/02-client/abci.go +++ b/core/02-client/abci.go @@ -2,8 +2,8 @@ package client import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/keeper" + "github.com/cosmos/ibc-go/core/exported" ) // BeginBlocker updates an existing localhost client with the latest block height. diff --git a/core/02-client/abci_test.go b/core/02-client/abci_test.go index 3a296618b31..6d4a8d60c6b 100644 --- a/core/02-client/abci_test.go +++ b/core/02-client/abci_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/suite" - client "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + client "github.com/cosmos/ibc-go/core/02-client" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + localhosttypes "github.com/cosmos/ibc-go/light-clients/09-localhost/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) type ClientTestSuite struct { diff --git a/core/02-client/client/cli/cli.go b/core/02-client/client/cli/cli.go index 33c99152158..74bb72be9f0 100644 --- a/core/02-client/client/cli/cli.go +++ b/core/02-client/client/cli/cli.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/types" ) // GetQueryCmd returns the query commands for IBC clients diff --git a/core/02-client/client/cli/query.go b/core/02-client/client/cli/query.go index c1b5e51a050..2a5ea8e7117 100644 --- a/core/02-client/client/cli/query.go +++ b/core/02-client/client/cli/query.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/02-client/client/utils" + "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" ) const ( diff --git a/core/02-client/client/cli/tx.go b/core/02-client/client/cli/tx.go index bdaa53a8ae1..9e62835fe92 100644 --- a/core/02-client/client/cli/tx.go +++ b/core/02-client/client/cli/tx.go @@ -16,8 +16,8 @@ import ( "github.com/cosmos/cosmos-sdk/version" govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // NewCreateClientCmd defines the command to create a new IBC light client. diff --git a/core/02-client/client/proposal_handler.go b/core/02-client/client/proposal_handler.go index 63585cbe50b..265a189ad19 100644 --- a/core/02-client/client/proposal_handler.go +++ b/core/02-client/client/proposal_handler.go @@ -2,7 +2,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/client/cli" + "github.com/cosmos/ibc-go/core/02-client/client/cli" ) var ProposalHandler = govclient.NewProposalHandler(cli.NewCmdSubmitUpdateClientProposal, nil) diff --git a/core/02-client/client/utils/utils.go b/core/02-client/client/utils/utils.go index 1a7bc003bc5..d6080c91d24 100644 --- a/core/02-client/client/utils/utils.go +++ b/core/02-client/client/utils/utils.go @@ -9,12 +9,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + ibcclient "github.com/cosmos/ibc-go/core/client" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) // QueryClientState returns a client state. If prove is true, it performs an ABCI store query diff --git a/core/02-client/genesis.go b/core/02-client/genesis.go index 26635f0784c..4516cfb17f7 100644 --- a/core/02-client/genesis.go +++ b/core/02-client/genesis.go @@ -4,9 +4,9 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/keeper" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // InitGenesis initializes the ibc client submodule's state from a provided genesis diff --git a/core/02-client/keeper/client.go b/core/02-client/keeper/client.go index 672dcf5d74d..45a2af429b2 100644 --- a/core/02-client/keeper/client.go +++ b/core/02-client/keeper/client.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // CreateClient creates a new client state and populates it with a given consensus diff --git a/core/02-client/keeper/client_test.go b/core/02-client/keeper/client_test.go index 0cf5c1fe1d5..231486a2db1 100644 --- a/core/02-client/keeper/client_test.go +++ b/core/02-client/keeper/client_test.go @@ -6,14 +6,14 @@ import ( tmtypes "github.com/tendermint/tendermint/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + "github.com/cosmos/ibc-go/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + localhosttypes "github.com/cosmos/ibc-go/light-clients/09-localhost/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibctestingmock "github.com/cosmos/ibc-go/testing/mock" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/core/02-client/keeper/encoding.go b/core/02-client/keeper/encoding.go index f2a07b864d2..1e4750b59af 100644 --- a/core/02-client/keeper/encoding.go +++ b/core/02-client/keeper/encoding.go @@ -1,8 +1,8 @@ package keeper import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // UnmarshalClientState attempts to decode and return an ClientState object from diff --git a/core/02-client/keeper/grpc_query.go b/core/02-client/keeper/grpc_query.go index 2134427729a..9d4d6ae66c0 100644 --- a/core/02-client/keeper/grpc_query.go +++ b/core/02-client/keeper/grpc_query.go @@ -14,9 +14,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ types.QueryServer = Keeper{} diff --git a/core/02-client/keeper/grpc_query_test.go b/core/02-client/keeper/grpc_query_test.go index 5e361a76f08..e0542ce4934 100644 --- a/core/02-client/keeper/grpc_query_test.go +++ b/core/02-client/keeper/grpc_query_test.go @@ -8,11 +8,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *KeeperTestSuite) TestQueryClientState() { diff --git a/core/02-client/keeper/keeper.go b/core/02-client/keeper/keeper.go index 67c5c0658d4..1278a76bf6e 100644 --- a/core/02-client/keeper/keeper.go +++ b/core/02-client/keeper/keeper.go @@ -12,11 +12,11 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/core/02-client/keeper/keeper_test.go b/core/02-client/keeper/keeper_test.go index c22e80cc9ec..4badc9f495c 100644 --- a/core/02-client/keeper/keeper_test.go +++ b/core/02-client/keeper/keeper_test.go @@ -15,14 +15,14 @@ import ( cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + "github.com/cosmos/ibc-go/core/02-client/keeper" + "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + localhosttypes "github.com/cosmos/ibc-go/light-clients/09-localhost/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibctestingmock "github.com/cosmos/ibc-go/testing/mock" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) diff --git a/core/02-client/keeper/params.go b/core/02-client/keeper/params.go index 04f4a256379..882372d178f 100644 --- a/core/02-client/keeper/params.go +++ b/core/02-client/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/types" ) // GetAllowedClients retrieves the receive enabled boolean from the paramstore diff --git a/core/02-client/keeper/params_test.go b/core/02-client/keeper/params_test.go index 9df08597100..36cbea10c56 100644 --- a/core/02-client/keeper/params_test.go +++ b/core/02-client/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/core/02-client/keeper/proposal.go b/core/02-client/keeper/proposal.go index 6d4ff350df3..78cb652d398 100644 --- a/core/02-client/keeper/proposal.go +++ b/core/02-client/keeper/proposal.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // ClientUpdateProposal will retrieve the subject and substitute client. diff --git a/core/02-client/keeper/proposal_test.go b/core/02-client/keeper/proposal_test.go index 8dbe43f7d7f..cb0816afe33 100644 --- a/core/02-client/keeper/proposal_test.go +++ b/core/02-client/keeper/proposal_test.go @@ -1,11 +1,11 @@ package keeper_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *KeeperTestSuite) TestClientUpdateProposal() { diff --git a/core/02-client/module.go b/core/02-client/module.go index 08efee8b1ad..78749db6996 100644 --- a/core/02-client/module.go +++ b/core/02-client/module.go @@ -4,8 +4,8 @@ import ( "github.com/gogo/protobuf/grpc" "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/client/cli" + "github.com/cosmos/ibc-go/core/02-client/types" ) // Name returns the IBC client name diff --git a/core/02-client/proposal_handler.go b/core/02-client/proposal_handler.go index befa95df642..8a76f16d6d9 100644 --- a/core/02-client/proposal_handler.go +++ b/core/02-client/proposal_handler.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/keeper" + "github.com/cosmos/ibc-go/core/02-client/types" ) // NewClientUpdateProposalHandler defines the client update proposal handler diff --git a/core/02-client/proposal_handler_test.go b/core/02-client/proposal_handler_test.go index 41b893186d6..047371ecbd0 100644 --- a/core/02-client/proposal_handler_test.go +++ b/core/02-client/proposal_handler_test.go @@ -4,11 +4,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - client "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + client "github.com/cosmos/ibc-go/core/02-client" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *ClientTestSuite) TestNewClientUpdateProposalHandler() { diff --git a/core/02-client/simulation/decoder.go b/core/02-client/simulation/decoder.go index 03a803b1b17..70736e3bdff 100644 --- a/core/02-client/simulation/decoder.go +++ b/core/02-client/simulation/decoder.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/02-client/keeper" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ ClientUnmarshaler = (*keeper.Keeper)(nil) diff --git a/core/02-client/simulation/decoder_test.go b/core/02-client/simulation/decoder_test.go index 095834ba0d6..1259409a3a2 100644 --- a/core/02-client/simulation/decoder_test.go +++ b/core/02-client/simulation/decoder_test.go @@ -9,10 +9,10 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + "github.com/cosmos/ibc-go/core/02-client/simulation" + "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) func TestDecodeStore(t *testing.T) { diff --git a/core/02-client/simulation/genesis.go b/core/02-client/simulation/genesis.go index 2f23197026c..cc9c16013e3 100644 --- a/core/02-client/simulation/genesis.go +++ b/core/02-client/simulation/genesis.go @@ -4,7 +4,7 @@ import ( "math/rand" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/types" ) // GenClientGenesis returns the default client genesis state. diff --git a/core/02-client/types/client.go b/core/02-client/types/client.go index 6d51828af0f..40d25cede6b 100644 --- a/core/02-client/types/client.go +++ b/core/02-client/types/client.go @@ -10,8 +10,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/02-client/types/client_test.go b/core/02-client/types/client_test.go index 2dfd3967d28..8854f189beb 100644 --- a/core/02-client/types/client_test.go +++ b/core/02-client/types/client_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *TypesTestSuite) TestMarshalConsensusStateWithHeight() { diff --git a/core/02-client/types/codec.go b/core/02-client/types/codec.go index 59a15832bec..441846b0a72 100644 --- a/core/02-client/types/codec.go +++ b/core/02-client/types/codec.go @@ -8,7 +8,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/msgservice" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // RegisterInterfaces registers the client interfaces to protobuf Any. diff --git a/core/02-client/types/codec_test.go b/core/02-client/types/codec_test.go index 75cfc97eb08..35913352bc1 100644 --- a/core/02-client/types/codec_test.go +++ b/core/02-client/types/codec_test.go @@ -2,12 +2,12 @@ package types_test import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + localhosttypes "github.com/cosmos/ibc-go/light-clients/09-localhost/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) type caseAny struct { diff --git a/core/02-client/types/encoding.go b/core/02-client/types/encoding.go index a912b13abd6..6e9cb07bf13 100644 --- a/core/02-client/types/encoding.go +++ b/core/02-client/types/encoding.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // MustUnmarshalClientState attempts to decode and return an ClientState object from diff --git a/core/02-client/types/events.go b/core/02-client/types/events.go index d0760ba89c8..47aeda7a9ea 100644 --- a/core/02-client/types/events.go +++ b/core/02-client/types/events.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) // IBC client events diff --git a/core/02-client/types/genesis.go b/core/02-client/types/genesis.go index 3f197208e33..e18059b1805 100644 --- a/core/02-client/types/genesis.go +++ b/core/02-client/types/genesis.go @@ -5,8 +5,8 @@ import ( "sort" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/02-client/types/genesis_test.go b/core/02-client/types/genesis_test.go index d57b8d1ba53..c50f5a30d9f 100644 --- a/core/02-client/types/genesis_test.go +++ b/core/02-client/types/genesis_test.go @@ -5,15 +5,15 @@ import ( tmtypes "github.com/tendermint/tendermint/types" - client "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + client "github.com/cosmos/ibc-go/core/02-client" + "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + localhosttypes "github.com/cosmos/ibc-go/light-clients/09-localhost/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibctestingmock "github.com/cosmos/ibc-go/testing/mock" ) const ( diff --git a/core/02-client/types/height.go b/core/02-client/types/height.go index 4216d54e668..9e19b92c9d5 100644 --- a/core/02-client/types/height.go +++ b/core/02-client/types/height.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.Height = (*Height)(nil) diff --git a/core/02-client/types/height_test.go b/core/02-client/types/height_test.go index a455b7f58d4..ca8c0092f4e 100644 --- a/core/02-client/types/height_test.go +++ b/core/02-client/types/height_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/types" ) func TestZeroHeight(t *testing.T) { diff --git a/core/02-client/types/keys.go b/core/02-client/types/keys.go index 321f5e3ffa3..58e01c88956 100644 --- a/core/02-client/types/keys.go +++ b/core/02-client/types/keys.go @@ -7,7 +7,7 @@ import ( "strings" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) const ( diff --git a/core/02-client/types/keys_test.go b/core/02-client/types/keys_test.go index 4938145236e..b9188d0e76d 100644 --- a/core/02-client/types/keys_test.go +++ b/core/02-client/types/keys_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/ibc-go/core/02-client/types" ) // tests ParseClientIdentifier and IsValidClientID diff --git a/core/02-client/types/msgs.go b/core/02-client/types/msgs.go index 1e884123d74..1092668cf92 100644 --- a/core/02-client/types/msgs.go +++ b/core/02-client/types/msgs.go @@ -4,8 +4,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // message types for the IBC client diff --git a/core/02-client/types/msgs_test.go b/core/02-client/types/msgs_test.go index e42725bae26..7a5aa8db7b7 100644 --- a/core/02-client/types/msgs_test.go +++ b/core/02-client/types/msgs_test.go @@ -7,12 +7,12 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + solomachinetypes "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) type TypesTestSuite struct { diff --git a/core/02-client/types/params.go b/core/02-client/types/params.go index 6477e3f6f4f..a652aa1a9e0 100644 --- a/core/02-client/types/params.go +++ b/core/02-client/types/params.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/core/02-client/types/params_test.go b/core/02-client/types/params_test.go index dac80a4b421..d29a864b402 100644 --- a/core/02-client/types/params_test.go +++ b/core/02-client/types/params_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) func TestValidateParams(t *testing.T) { diff --git a/core/02-client/types/proposal_test.go b/core/02-client/types/proposal_test.go index 597e5cf8f80..f53d891b421 100644 --- a/core/02-client/types/proposal_test.go +++ b/core/02-client/types/proposal_test.go @@ -4,9 +4,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *TypesTestSuite) TestValidateBasic() { diff --git a/core/02-client/types/query.go b/core/02-client/types/query.go index c46bbfcfe77..2794d8aabba 100644 --- a/core/02-client/types/query.go +++ b/core/02-client/types/query.go @@ -2,7 +2,7 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/03-connection/client/cli/cli.go b/core/03-connection/client/cli/cli.go index 01bb6f9b110..05c3770c19d 100644 --- a/core/03-connection/client/cli/cli.go +++ b/core/03-connection/client/cli/cli.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + "github.com/cosmos/ibc-go/core/03-connection/types" ) // GetQueryCmd returns the query commands for IBC connections diff --git a/core/03-connection/client/cli/query.go b/core/03-connection/client/cli/query.go index 21c4bd8f578..5771063c2f9 100644 --- a/core/03-connection/client/cli/query.go +++ b/core/03-connection/client/cli/query.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/03-connection/client/utils" + "github.com/cosmos/ibc-go/core/03-connection/types" + host "github.com/cosmos/ibc-go/core/24-host" ) // GetCmdQueryConnections defines the command to query all the connection ends diff --git a/core/03-connection/client/cli/tx.go b/core/03-connection/client/cli/tx.go index 68b1a620820..68115ec0713 100644 --- a/core/03-connection/client/cli/tx.go +++ b/core/03-connection/client/cli/tx.go @@ -14,10 +14,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/msgservice" "github.com/cosmos/cosmos-sdk/version" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/client/utils" + "github.com/cosmos/ibc-go/core/03-connection/types" + host "github.com/cosmos/ibc-go/core/24-host" ) const ( diff --git a/core/03-connection/client/utils/utils.go b/core/03-connection/client/utils/utils.go index e1eb1ce00c5..035fb508dcf 100644 --- a/core/03-connection/client/utils/utils.go +++ b/core/03-connection/client/utils/utils.go @@ -10,13 +10,13 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clientutils "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/client/utils" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clientutils "github.com/cosmos/ibc-go/core/02-client/client/utils" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + ibcclient "github.com/cosmos/ibc-go/core/client" + "github.com/cosmos/ibc-go/core/exported" ) // QueryConnection returns a connection end. diff --git a/core/03-connection/genesis.go b/core/03-connection/genesis.go index a1bb30f1fe5..c97dcc4083f 100644 --- a/core/03-connection/genesis.go +++ b/core/03-connection/genesis.go @@ -2,8 +2,8 @@ package connection import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + "github.com/cosmos/ibc-go/core/03-connection/keeper" + "github.com/cosmos/ibc-go/core/03-connection/types" ) // InitGenesis initializes the ibc connection submodule's state from a provided genesis diff --git a/core/03-connection/keeper/grpc_query.go b/core/03-connection/keeper/grpc_query.go index 62b1c00a349..e8399f4eadf 100644 --- a/core/03-connection/keeper/grpc_query.go +++ b/core/03-connection/keeper/grpc_query.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + host "github.com/cosmos/ibc-go/core/24-host" ) var _ types.QueryServer = Keeper{} diff --git a/core/03-connection/keeper/grpc_query_test.go b/core/03-connection/keeper/grpc_query_test.go index 14fdb425d9e..d0f453083ec 100644 --- a/core/03-connection/keeper/grpc_query_test.go +++ b/core/03-connection/keeper/grpc_query_test.go @@ -5,11 +5,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *KeeperTestSuite) TestQueryConnection() { diff --git a/core/03-connection/keeper/handshake.go b/core/03-connection/keeper/handshake.go index b8f7466f159..fe2715c6a7f 100644 --- a/core/03-connection/keeper/handshake.go +++ b/core/03-connection/keeper/handshake.go @@ -8,10 +8,10 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" ) // ConnOpenInit initialises a connection attempt on chain A. The generated connection identifier diff --git a/core/03-connection/keeper/handshake_test.go b/core/03-connection/keeper/handshake_test.go index 101c061a752..9cad93d6963 100644 --- a/core/03-connection/keeper/handshake_test.go +++ b/core/03-connection/keeper/handshake_test.go @@ -3,11 +3,11 @@ package keeper_test import ( "time" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) // TestConnOpenInit - chainA initializes (INIT state) a connection with diff --git a/core/03-connection/keeper/keeper.go b/core/03-connection/keeper/keeper.go index 6637268687c..1dfea3d58d2 100644 --- a/core/03-connection/keeper/keeper.go +++ b/core/03-connection/keeper/keeper.go @@ -6,11 +6,11 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // Keeper defines the IBC connection keeper diff --git a/core/03-connection/keeper/keeper_test.go b/core/03-connection/keeper/keeper_test.go index f2a1124b551..a2c30e44ef8 100644 --- a/core/03-connection/keeper/keeper_test.go +++ b/core/03-connection/keeper/keeper_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) type KeeperTestSuite struct { diff --git a/core/03-connection/keeper/verify.go b/core/03-connection/keeper/verify.go index ddb1ea6b961..c8b57ea6054 100644 --- a/core/03-connection/keeper/verify.go +++ b/core/03-connection/keeper/verify.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // VerifyClientState verifies a proof of a client state of the running machine diff --git a/core/03-connection/keeper/verify_test.go b/core/03-connection/keeper/verify_test.go index 2d94955d8ef..f9a71e29f0d 100644 --- a/core/03-connection/keeper/verify_test.go +++ b/core/03-connection/keeper/verify_test.go @@ -4,14 +4,14 @@ import ( "fmt" "time" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibcmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibcmock "github.com/cosmos/ibc-go/testing/mock" ) var defaultTimeoutHeight = clienttypes.NewHeight(0, 100000) diff --git a/core/03-connection/module.go b/core/03-connection/module.go index 6100caa4622..dc3432cbd77 100644 --- a/core/03-connection/module.go +++ b/core/03-connection/module.go @@ -4,8 +4,8 @@ import ( "github.com/gogo/protobuf/grpc" "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + "github.com/cosmos/ibc-go/core/03-connection/client/cli" + "github.com/cosmos/ibc-go/core/03-connection/types" ) // Name returns the IBC connection ICS name. diff --git a/core/03-connection/simulation/decoder.go b/core/03-connection/simulation/decoder.go index ef988a103f5..95766356e74 100644 --- a/core/03-connection/simulation/decoder.go +++ b/core/03-connection/simulation/decoder.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/03-connection/types" + host "github.com/cosmos/ibc-go/core/24-host" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/core/03-connection/simulation/decoder_test.go b/core/03-connection/simulation/decoder_test.go index 673bf640065..1d67029963f 100644 --- a/core/03-connection/simulation/decoder_test.go +++ b/core/03-connection/simulation/decoder_test.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/03-connection/simulation" + "github.com/cosmos/ibc-go/core/03-connection/types" + host "github.com/cosmos/ibc-go/core/24-host" ) func TestDecodeStore(t *testing.T) { diff --git a/core/03-connection/simulation/genesis.go b/core/03-connection/simulation/genesis.go index 43b0823776d..4f20cb73394 100644 --- a/core/03-connection/simulation/genesis.go +++ b/core/03-connection/simulation/genesis.go @@ -4,7 +4,7 @@ import ( "math/rand" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + "github.com/cosmos/ibc-go/core/03-connection/types" ) // GenConnectionGenesis returns the default connection genesis state. diff --git a/core/03-connection/types/codec.go b/core/03-connection/types/codec.go index 6105fa9ee1d..960f259ac07 100644 --- a/core/03-connection/types/codec.go +++ b/core/03-connection/types/codec.go @@ -5,7 +5,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // RegisterInterfaces register the ibc interfaces submodule implementations to protobuf diff --git a/core/03-connection/types/connection.go b/core/03-connection/types/connection.go index 197af83cad9..5eed19586c3 100644 --- a/core/03-connection/types/connection.go +++ b/core/03-connection/types/connection.go @@ -2,9 +2,9 @@ package types import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.ConnectionI = (*ConnectionEnd)(nil) diff --git a/core/03-connection/types/connection_test.go b/core/03-connection/types/connection_test.go index e7e91538c4e..78390bf0966 100644 --- a/core/03-connection/types/connection_test.go +++ b/core/03-connection/types/connection_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) var ( diff --git a/core/03-connection/types/events.go b/core/03-connection/types/events.go index 3cb5997bd10..dbbb69e0d32 100644 --- a/core/03-connection/types/events.go +++ b/core/03-connection/types/events.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) // IBC connection events diff --git a/core/03-connection/types/expected_keepers.go b/core/03-connection/types/expected_keepers.go index 9fc99586718..a3e5446a880 100644 --- a/core/03-connection/types/expected_keepers.go +++ b/core/03-connection/types/expected_keepers.go @@ -2,7 +2,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // ClientKeeper expected account IBC client keeper diff --git a/core/03-connection/types/genesis.go b/core/03-connection/types/genesis.go index b10c300a84a..677f9a94d92 100644 --- a/core/03-connection/types/genesis.go +++ b/core/03-connection/types/genesis.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) // NewConnectionPaths creates a ConnectionPaths instance. diff --git a/core/03-connection/types/genesis_test.go b/core/03-connection/types/genesis_test.go index 846837f9af7..104147be491 100644 --- a/core/03-connection/types/genesis_test.go +++ b/core/03-connection/types/genesis_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func TestValidateGenesis(t *testing.T) { diff --git a/core/03-connection/types/keys.go b/core/03-connection/types/keys.go index 65af565c2ab..a06039eb681 100644 --- a/core/03-connection/types/keys.go +++ b/core/03-connection/types/keys.go @@ -5,7 +5,7 @@ import ( "regexp" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) const ( diff --git a/core/03-connection/types/keys_test.go b/core/03-connection/types/keys_test.go index 6adb8090f89..0650aed143c 100644 --- a/core/03-connection/types/keys_test.go +++ b/core/03-connection/types/keys_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + "github.com/cosmos/ibc-go/core/03-connection/types" ) // tests ParseConnectionSequence and IsValidConnectionID diff --git a/core/03-connection/types/msgs.go b/core/03-connection/types/msgs.go index 3ba1aed8e7e..797ad31e8c4 100644 --- a/core/03-connection/types/msgs.go +++ b/core/03-connection/types/msgs.go @@ -4,10 +4,10 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/03-connection/types/msgs_test.go b/core/03-connection/types/msgs_test.go index 6aff3b0904b..627cdab28e1 100644 --- a/core/03-connection/types/msgs_test.go +++ b/core/03-connection/types/msgs_test.go @@ -15,11 +15,11 @@ import ( "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) var ( diff --git a/core/03-connection/types/query.go b/core/03-connection/types/query.go index 7661b38d9bb..f182c2b5306 100644 --- a/core/03-connection/types/query.go +++ b/core/03-connection/types/query.go @@ -2,8 +2,8 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/03-connection/types/version.go b/core/03-connection/types/version.go index 10c5b33d285..97f1a11a88b 100644 --- a/core/03-connection/types/version.go +++ b/core/03-connection/types/version.go @@ -4,7 +4,7 @@ import ( "strings" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/03-connection/types/version_test.go b/core/03-connection/types/version_test.go index 8f882dd3271..cf0e73da3bf 100644 --- a/core/03-connection/types/version_test.go +++ b/core/03-connection/types/version_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) func TestValidateVersion(t *testing.T) { diff --git a/core/04-channel/client/cli/cli.go b/core/04-channel/client/cli/cli.go index baf386fecaf..9c0ccb42055 100644 --- a/core/04-channel/client/cli/cli.go +++ b/core/04-channel/client/cli/cli.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/types" ) // GetQueryCmd returns the query commands for IBC channels diff --git a/core/04-channel/client/cli/query.go b/core/04-channel/client/cli/query.go index 03df474f1e7..e86e20c3c11 100644 --- a/core/04-channel/client/cli/query.go +++ b/core/04-channel/client/cli/query.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/04-channel/client/utils" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" ) const ( diff --git a/core/04-channel/client/cli/tx.go b/core/04-channel/client/cli/tx.go index 20afe622674..f3ebaadc0d6 100644 --- a/core/04-channel/client/cli/tx.go +++ b/core/04-channel/client/cli/tx.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/types/msgservice" - ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectionutils "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + ibctransfertypes "github.com/cosmos/ibc-go/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectionutils "github.com/cosmos/ibc-go/core/03-connection/client/utils" + "github.com/cosmos/ibc-go/core/04-channel/types" ) // IBC Channel flags diff --git a/core/04-channel/client/utils/utils.go b/core/04-channel/client/utils/utils.go index 167e05d048e..ab58bea75ca 100644 --- a/core/04-channel/client/utils/utils.go +++ b/core/04-channel/client/utils/utils.go @@ -7,12 +7,12 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clientutils "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/client/utils" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/client" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clientutils "github.com/cosmos/ibc-go/core/02-client/client/utils" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + ibcclient "github.com/cosmos/ibc-go/core/client" + "github.com/cosmos/ibc-go/core/exported" ) // QueryChannel returns a channel end. diff --git a/core/04-channel/genesis.go b/core/04-channel/genesis.go index 07fad47d77b..9564e5819ca 100644 --- a/core/04-channel/genesis.go +++ b/core/04-channel/genesis.go @@ -2,8 +2,8 @@ package channel import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/keeper" + "github.com/cosmos/ibc-go/core/04-channel/types" ) // InitGenesis initializes the ibc channel submodule's state from a provided genesis diff --git a/core/04-channel/handler.go b/core/04-channel/handler.go index 375c35263ec..59d29f09640 100644 --- a/core/04-channel/handler.go +++ b/core/04-channel/handler.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/keeper" + "github.com/cosmos/ibc-go/core/04-channel/types" ) // HandleMsgChannelOpenInit defines the sdk.Handler for MsgChannelOpenInit diff --git a/core/04-channel/keeper/grpc_query.go b/core/04-channel/keeper/grpc_query.go index 30df0a33ace..689d4f28571 100644 --- a/core/04-channel/keeper/grpc_query.go +++ b/core/04-channel/keeper/grpc_query.go @@ -12,10 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" ) var _ types.QueryServer = (*Keeper)(nil) diff --git a/core/04-channel/keeper/grpc_query_test.go b/core/04-channel/keeper/grpc_query_test.go index 689c241c7b8..9e0a7696fd5 100644 --- a/core/04-channel/keeper/grpc_query_test.go +++ b/core/04-channel/keeper/grpc_query_test.go @@ -5,11 +5,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *KeeperTestSuite) TestQueryChannel() { diff --git a/core/04-channel/keeper/handshake.go b/core/04-channel/keeper/handshake.go index b7cff480c96..a3f8a238b30 100644 --- a/core/04-channel/keeper/handshake.go +++ b/core/04-channel/keeper/handshake.go @@ -5,11 +5,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/core/05-port/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // CounterpartyHops returns the connection hops of the counterparty channel. diff --git a/core/04-channel/keeper/handshake_test.go b/core/04-channel/keeper/handshake_test.go index 120e1f8fe22..64a49f7eaa3 100644 --- a/core/04-channel/keeper/handshake_test.go +++ b/core/04-channel/keeper/handshake_test.go @@ -4,12 +4,12 @@ import ( "fmt" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) type testCase = struct { diff --git a/core/04-channel/keeper/keeper.go b/core/04-channel/keeper/keeper.go index 60452f315bd..930a6ec40bb 100644 --- a/core/04-channel/keeper/keeper.go +++ b/core/04-channel/keeper/keeper.go @@ -12,12 +12,12 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/core/05-port/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // Keeper defines the IBC channel keeper diff --git a/core/04-channel/keeper/keeper_test.go b/core/04-channel/keeper/keeper_test.go index a9b7dd6cf1c..7bc07190609 100644 --- a/core/04-channel/keeper/keeper_test.go +++ b/core/04-channel/keeper/keeper_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/04-channel/types" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) // KeeperTestSuite is a testing suite to test keeper functions. diff --git a/core/04-channel/keeper/packet.go b/core/04-channel/keeper/packet.go index 49b59733c5a..3cedbfe4df8 100644 --- a/core/04-channel/keeper/packet.go +++ b/core/04-channel/keeper/packet.go @@ -8,11 +8,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // SendPacket is called by a module in order to send an IBC packet on a channel diff --git a/core/04-channel/keeper/packet_test.go b/core/04-channel/keeper/packet_test.go index 232e6875824..91743d61c56 100644 --- a/core/04-channel/keeper/packet_test.go +++ b/core/04-channel/keeper/packet_test.go @@ -4,13 +4,13 @@ import ( "fmt" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibcmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibcmock "github.com/cosmos/ibc-go/testing/mock" ) var ( diff --git a/core/04-channel/keeper/timeout.go b/core/04-channel/keeper/timeout.go index 1f3dac918f6..2b6e65eadb5 100644 --- a/core/04-channel/keeper/timeout.go +++ b/core/04-channel/keeper/timeout.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // TimeoutPacket is called by a module which originally attempted to send a diff --git a/core/04-channel/keeper/timeout_test.go b/core/04-channel/keeper/timeout_test.go index 640452e881b..b7a34c73116 100644 --- a/core/04-channel/keeper/timeout_test.go +++ b/core/04-channel/keeper/timeout_test.go @@ -4,11 +4,11 @@ import ( "fmt" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctesting "github.com/cosmos/ibc-go/testing" ) // TestTimeoutPacket test the TimeoutPacket call on chainA by ensuring the timeout has passed diff --git a/core/04-channel/module.go b/core/04-channel/module.go index 569120ad921..6a9aceac5d8 100644 --- a/core/04-channel/module.go +++ b/core/04-channel/module.go @@ -4,8 +4,8 @@ import ( "github.com/gogo/protobuf/grpc" "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/client/cli" + "github.com/cosmos/ibc-go/core/04-channel/types" ) // Name returns the IBC channel ICS name. diff --git a/core/04-channel/simulation/decoder.go b/core/04-channel/simulation/decoder.go index 809976cc0e2..efdcf589667 100644 --- a/core/04-channel/simulation/decoder.go +++ b/core/04-channel/simulation/decoder.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/core/04-channel/simulation/decoder_test.go b/core/04-channel/simulation/decoder_test.go index 5f2ba2f5ecb..10cdcb0b46c 100644 --- a/core/04-channel/simulation/decoder_test.go +++ b/core/04-channel/simulation/decoder_test.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/04-channel/simulation" + "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" ) func TestDecodeStore(t *testing.T) { diff --git a/core/04-channel/simulation/genesis.go b/core/04-channel/simulation/genesis.go index ed33902191b..108507581f2 100644 --- a/core/04-channel/simulation/genesis.go +++ b/core/04-channel/simulation/genesis.go @@ -4,7 +4,7 @@ import ( "math/rand" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/types" ) // GenChannelGenesis returns the default channel genesis state. diff --git a/core/04-channel/types/channel.go b/core/04-channel/types/channel.go index 8513a8123df..6036942f401 100644 --- a/core/04-channel/types/channel.go +++ b/core/04-channel/types/channel.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/04-channel/types/channel_test.go b/core/04-channel/types/channel_test.go index 30fee4443b2..3f42c5c0988 100644 --- a/core/04-channel/types/channel_test.go +++ b/core/04-channel/types/channel_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/types" ) func TestChannelValidateBasic(t *testing.T) { diff --git a/core/04-channel/types/codec.go b/core/04-channel/types/codec.go index a74f0a7fc9c..fb83e09ca80 100644 --- a/core/04-channel/types/codec.go +++ b/core/04-channel/types/codec.go @@ -5,7 +5,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // RegisterInterfaces register the ibc channel submodule interfaces to protobuf diff --git a/core/04-channel/types/events.go b/core/04-channel/types/events.go index b9ddb3052c3..36af818fc41 100644 --- a/core/04-channel/types/events.go +++ b/core/04-channel/types/events.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) // IBC channel events diff --git a/core/04-channel/types/expected_keepers.go b/core/04-channel/types/expected_keepers.go index d3b74b7e29a..d34167b2bdf 100644 --- a/core/04-channel/types/expected_keepers.go +++ b/core/04-channel/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + "github.com/cosmos/ibc-go/core/exported" ) // ClientKeeper expected account IBC client keeper diff --git a/core/04-channel/types/genesis.go b/core/04-channel/types/genesis.go index 2c431e97b33..6b0b2d3c13c 100644 --- a/core/04-channel/types/genesis.go +++ b/core/04-channel/types/genesis.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) // NewPacketState creates a new PacketState instance. diff --git a/core/04-channel/types/genesis_test.go b/core/04-channel/types/genesis_test.go index a0d21007a77..74e53f757c8 100644 --- a/core/04-channel/types/genesis_test.go +++ b/core/04-channel/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/types" ) const ( diff --git a/core/04-channel/types/keys.go b/core/04-channel/types/keys.go index d3a6cde24d5..62f8134171d 100644 --- a/core/04-channel/types/keys.go +++ b/core/04-channel/types/keys.go @@ -5,7 +5,7 @@ import ( "regexp" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + host "github.com/cosmos/ibc-go/core/24-host" ) const ( diff --git a/core/04-channel/types/keys_test.go b/core/04-channel/types/keys_test.go index 9bc6500b9af..0c3d67b8344 100644 --- a/core/04-channel/types/keys_test.go +++ b/core/04-channel/types/keys_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + "github.com/cosmos/ibc-go/core/04-channel/types" ) // tests ParseChannelSequence and IsValidChannelID diff --git a/core/04-channel/types/msgs.go b/core/04-channel/types/msgs.go index da14a31030f..013ac9bf82a 100644 --- a/core/04-channel/types/msgs.go +++ b/core/04-channel/types/msgs.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" ) var _ sdk.Msg = &MsgChannelOpenInit{} diff --git a/core/04-channel/types/msgs_test.go b/core/04-channel/types/msgs_test.go index 9c27fd69efa..37bcbbbb2e9 100644 --- a/core/04-channel/types/msgs_test.go +++ b/core/04-channel/types/msgs_test.go @@ -14,10 +14,10 @@ import ( "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" ) const ( diff --git a/core/04-channel/types/packet.go b/core/04-channel/types/packet.go index b5c8d180438..5f08223c5a1 100644 --- a/core/04-channel/types/packet.go +++ b/core/04-channel/types/packet.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // CommitPacket returns the packet commitment bytes. The commitment consists of: diff --git a/core/04-channel/types/packet_test.go b/core/04-channel/types/packet_test.go index 12ed828e665..d7a9878bc35 100644 --- a/core/04-channel/types/packet_test.go +++ b/core/04-channel/types/packet_test.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/04-channel/types" ) func TestCommitPacket(t *testing.T) { diff --git a/core/04-channel/types/query.go b/core/04-channel/types/query.go index d1536dfc056..9a50900caf4 100644 --- a/core/04-channel/types/query.go +++ b/core/04-channel/types/query.go @@ -2,8 +2,8 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/core/05-port/keeper/keeper.go b/core/05-port/keeper/keeper.go index 8a4b2300a4e..31ba4c91360 100644 --- a/core/05-port/keeper/keeper.go +++ b/core/05-port/keeper/keeper.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/ibc-go/core/05-port/types" + host "github.com/cosmos/ibc-go/core/24-host" ) // Keeper defines the IBC connection keeper diff --git a/core/05-port/keeper/keeper_test.go b/core/05-port/keeper/keeper_test.go index 29c0e158574..e27938a1c8a 100644 --- a/core/05-port/keeper/keeper_test.go +++ b/core/05-port/keeper/keeper_test.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/keeper" + "github.com/cosmos/ibc-go/core/05-port/keeper" ) var ( diff --git a/core/05-port/types/module.go b/core/05-port/types/module.go index 4c686732018..40a737e3325 100644 --- a/core/05-port/types/module.go +++ b/core/05-port/types/module.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" ) // IBCModule defines an interface that implements all the callbacks diff --git a/core/23-commitment/types/codec.go b/core/23-commitment/types/codec.go index 1195c7c26db..11389f2d57f 100644 --- a/core/23-commitment/types/codec.go +++ b/core/23-commitment/types/codec.go @@ -2,7 +2,7 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // RegisterInterfaces registers the commitment interfaces to protobuf Any. diff --git a/core/23-commitment/types/merkle.go b/core/23-commitment/types/merkle.go index e90fccc34b2..706ba7df1ab 100644 --- a/core/23-commitment/types/merkle.go +++ b/core/23-commitment/types/merkle.go @@ -10,7 +10,7 @@ import ( tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // var representing the proofspecs for a SDK chain diff --git a/core/23-commitment/types/merkle_test.go b/core/23-commitment/types/merkle_test.go index 3c53847fadd..54016dd7467 100644 --- a/core/23-commitment/types/merkle_test.go +++ b/core/23-commitment/types/merkle_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/23-commitment/types" ) func (suite *MerkleTestSuite) TestVerifyMembership() { diff --git a/core/23-commitment/types/utils_test.go b/core/23-commitment/types/utils_test.go index f852fb6c2c4..44513ac9283 100644 --- a/core/23-commitment/types/utils_test.go +++ b/core/23-commitment/types/utils_test.go @@ -7,7 +7,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/23-commitment/types" ) func (suite *MerkleTestSuite) TestConvertProofs() { diff --git a/core/24-host/keys.go b/core/24-host/keys.go index 21f4bc43090..81a4999b67f 100644 --- a/core/24-host/keys.go +++ b/core/24-host/keys.go @@ -3,7 +3,7 @@ package host import ( "fmt" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) const ( diff --git a/core/24-host/parse_test.go b/core/24-host/parse_test.go index 9f74bf5f682..83c2a864969 100644 --- a/core/24-host/parse_test.go +++ b/core/24-host/parse_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + host "github.com/cosmos/ibc-go/core/24-host" ) func TestParseIdentifier(t *testing.T) { diff --git a/core/client/cli/cli.go b/core/client/cli/cli.go index bda4123be0e..b1fced08032 100644 --- a/core/client/cli/cli.go +++ b/core/client/cli/cli.go @@ -4,10 +4,10 @@ import ( "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" - connection "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection" - channel "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + ibcclient "github.com/cosmos/ibc-go/core/02-client" + connection "github.com/cosmos/ibc-go/core/03-connection" + channel "github.com/cosmos/ibc-go/core/04-channel" + host "github.com/cosmos/ibc-go/core/24-host" ) // GetTxCmd returns the transaction commands for this module diff --git a/core/client/query.go b/core/client/query.go index 7055f1c740b..72923d716db 100644 --- a/core/client/query.go +++ b/core/client/query.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" ) // QueryTendermintProof performs an ABCI query with the given key and returns diff --git a/core/genesis.go b/core/genesis.go index 7d5d60b9345..c7fa47cd7d9 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -2,11 +2,11 @@ package ibc import ( sdk "github.com/cosmos/cosmos-sdk/types" - client "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" - connection "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection" - channel "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel" - "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/types" + client "github.com/cosmos/ibc-go/core/02-client" + connection "github.com/cosmos/ibc-go/core/03-connection" + channel "github.com/cosmos/ibc-go/core/04-channel" + "github.com/cosmos/ibc-go/core/keeper" + "github.com/cosmos/ibc-go/core/types" ) // InitGenesis initializes the ibc state from a provided genesis diff --git a/core/genesis_test.go b/core/genesis_test.go index c29feef7f8f..3e6e60030a1 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -9,16 +9,16 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/simapp" - ibc "github.com/cosmos/cosmos-sdk/x/ibc/core" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/core/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + ibc "github.com/cosmos/ibc-go/core" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/core/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + localhosttypes "github.com/cosmos/ibc-go/light-clients/09-localhost/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) const ( diff --git a/core/handler.go b/core/handler.go index c8e4dfc8984..040d9065b23 100644 --- a/core/handler.go +++ b/core/handler.go @@ -3,10 +3,10 @@ package ibc import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + "github.com/cosmos/ibc-go/core/keeper" ) // NewHandler defines the IBC handler diff --git a/core/keeper/grpc_query.go b/core/keeper/grpc_query.go index f406d2e86f0..98eecb31b1d 100644 --- a/core/keeper/grpc_query.go +++ b/core/keeper/grpc_query.go @@ -3,9 +3,9 @@ package keeper import ( "context" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" ) // ClientState implements the IBC QueryServer interface diff --git a/core/keeper/keeper.go b/core/keeper/keeper.go index 5f9abc382ec..4773599303b 100644 --- a/core/keeper/keeper.go +++ b/core/keeper/keeper.go @@ -4,13 +4,13 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" - clientkeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectionkeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/keeper" - channelkeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/keeper" - portkeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/keeper" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/types" + clientkeeper "github.com/cosmos/ibc-go/core/02-client/keeper" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectionkeeper "github.com/cosmos/ibc-go/core/03-connection/keeper" + channelkeeper "github.com/cosmos/ibc-go/core/04-channel/keeper" + portkeeper "github.com/cosmos/ibc-go/core/05-port/keeper" + porttypes "github.com/cosmos/ibc-go/core/05-port/types" + "github.com/cosmos/ibc-go/core/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/core/keeper/msg_server.go b/core/keeper/msg_server.go index dcddcaed16d..c2a8912ce60 100644 --- a/core/keeper/msg_server.go +++ b/core/keeper/msg_server.go @@ -8,11 +8,11 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channel "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channel "github.com/cosmos/ibc-go/core/04-channel" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/core/05-port/types" ) var _ clienttypes.MsgServer = Keeper{} diff --git a/core/keeper/msg_server_test.go b/core/keeper/msg_server_test.go index 1af4cdc18eb..1fd7d9e15d8 100644 --- a/core/keeper/msg_server_test.go +++ b/core/keeper/msg_server_test.go @@ -6,15 +6,15 @@ import ( "github.com/stretchr/testify/suite" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibcmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/core/keeper" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibcmock "github.com/cosmos/ibc-go/testing/mock" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/core/module.go b/core/module.go index 6527ab71eb2..5907190c851 100644 --- a/core/module.go +++ b/core/module.go @@ -18,15 +18,15 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/core/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/types" + ibcclient "github.com/cosmos/ibc-go/core/02-client" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/client/cli" + "github.com/cosmos/ibc-go/core/keeper" + "github.com/cosmos/ibc-go/core/simulation" + "github.com/cosmos/ibc-go/core/types" ) var ( diff --git a/core/simulation/decoder.go b/core/simulation/decoder.go index 459eebb8f07..8b4e3074184 100644 --- a/core/simulation/decoder.go +++ b/core/simulation/decoder.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/types/kv" - clientsim "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/simulation" - connectionsim "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/simulation" - channelsim "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/simulation" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper" + clientsim "github.com/cosmos/ibc-go/core/02-client/simulation" + connectionsim "github.com/cosmos/ibc-go/core/03-connection/simulation" + channelsim "github.com/cosmos/ibc-go/core/04-channel/simulation" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/keeper" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/core/simulation/decoder_test.go b/core/simulation/decoder_test.go index 0951572743b..192dc9a8114 100644 --- a/core/simulation/decoder_test.go +++ b/core/simulation/decoder_test.go @@ -8,12 +8,12 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/types/kv" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/simulation" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/simulation" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) func TestDecodeStore(t *testing.T) { diff --git a/core/simulation/genesis.go b/core/simulation/genesis.go index d71f4492500..7944e2751ef 100644 --- a/core/simulation/genesis.go +++ b/core/simulation/genesis.go @@ -8,14 +8,14 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/types/module" - clientsims "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/simulation" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectionsims "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/simulation" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channelsims "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/simulation" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/types" + clientsims "github.com/cosmos/ibc-go/core/02-client/simulation" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectionsims "github.com/cosmos/ibc-go/core/03-connection/simulation" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channelsims "github.com/cosmos/ibc-go/core/04-channel/simulation" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/types" ) // Simulation parameter constants diff --git a/core/simulation/genesis_test.go b/core/simulation/genesis_test.go index 54aff75ad9c..44b5549d904 100644 --- a/core/simulation/genesis_test.go +++ b/core/simulation/genesis_test.go @@ -11,9 +11,9 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/core/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/simulation" + "github.com/cosmos/ibc-go/core/types" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/core/types/codec.go b/core/types/codec.go index db110ac9d5f..16351c74b70 100644 --- a/core/types/codec.go +++ b/core/types/codec.go @@ -2,13 +2,13 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + solomachinetypes "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + localhosttypes "github.com/cosmos/ibc-go/light-clients/09-localhost/types" ) // RegisterInterfaces registers x/ibc interfaces into protobuf Any. diff --git a/core/types/genesis.go b/core/types/genesis.go index f7d78e5c114..cd8051afa78 100644 --- a/core/types/genesis.go +++ b/core/types/genesis.go @@ -2,9 +2,9 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" ) var _ codectypes.UnpackInterfacesMessage = GenesisState{} diff --git a/core/types/query.go b/core/types/query.go index fba69b3a197..bd7d2e83f8d 100644 --- a/core/types/query.go +++ b/core/types/query.go @@ -3,12 +3,12 @@ package types import ( "github.com/gogo/protobuf/grpc" - client "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connection "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channel "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + client "github.com/cosmos/ibc-go/core/02-client" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connection "github.com/cosmos/ibc-go/core/03-connection" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channel "github.com/cosmos/ibc-go/core/04-channel" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" ) // QueryServer defines the IBC interfaces that the gRPC query server must implement diff --git a/light-clients/06-solomachine/module.go b/light-clients/06-solomachine/module.go index bafbd0152f1..bfc820b8480 100644 --- a/light-clients/06-solomachine/module.go +++ b/light-clients/06-solomachine/module.go @@ -1,7 +1,7 @@ package solomachine import ( - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" ) // Name returns the solo machine client name. diff --git a/light-clients/06-solomachine/types/client_state.go b/light-clients/06-solomachine/types/client_state.go index 24a6582f0f2..5dfadd251cb 100644 --- a/light-clients/06-solomachine/types/client_state.go +++ b/light-clients/06-solomachine/types/client_state.go @@ -10,10 +10,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/tx/signing" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.ClientState = (*ClientState)(nil) diff --git a/light-clients/06-solomachine/types/client_state_test.go b/light-clients/06-solomachine/types/client_state_test.go index 4f6c195c898..88931bc5381 100644 --- a/light-clients/06-solomachine/types/client_state_test.go +++ b/light-clients/06-solomachine/types/client_state_test.go @@ -1,14 +1,14 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) const ( diff --git a/light-clients/06-solomachine/types/codec.go b/light-clients/06-solomachine/types/codec.go index 313a910ca96..5b82081f01e 100644 --- a/light-clients/06-solomachine/types/codec.go +++ b/light-clients/06-solomachine/types/codec.go @@ -5,8 +5,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/tx/signing" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // RegisterInterfaces register the ibc channel submodule interfaces to protobuf diff --git a/light-clients/06-solomachine/types/codec_test.go b/light-clients/06-solomachine/types/codec_test.go index 70be186a10b..68539aa861f 100644 --- a/light-clients/06-solomachine/types/codec_test.go +++ b/light-clients/06-solomachine/types/codec_test.go @@ -1,11 +1,11 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite SoloMachineTestSuite) TestUnmarshalDataByType() { diff --git a/light-clients/06-solomachine/types/consensus_state.go b/light-clients/06-solomachine/types/consensus_state.go index 7d6d09cd046..72efd980761 100644 --- a/light-clients/06-solomachine/types/consensus_state.go +++ b/light-clients/06-solomachine/types/consensus_state.go @@ -5,8 +5,8 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.ConsensusState = &ConsensusState{} diff --git a/light-clients/06-solomachine/types/consensus_state_test.go b/light-clients/06-solomachine/types/consensus_state_test.go index e0c22f95957..d943b6ee501 100644 --- a/light-clients/06-solomachine/types/consensus_state_test.go +++ b/light-clients/06-solomachine/types/consensus_state_test.go @@ -1,9 +1,9 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *SoloMachineTestSuite) TestConsensusState() { diff --git a/light-clients/06-solomachine/types/header.go b/light-clients/06-solomachine/types/header.go index f9c5f176fda..384193cfdd7 100644 --- a/light-clients/06-solomachine/types/header.go +++ b/light-clients/06-solomachine/types/header.go @@ -5,8 +5,8 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.Header = &Header{} diff --git a/light-clients/06-solomachine/types/header_test.go b/light-clients/06-solomachine/types/header_test.go index a5ca45e8aa8..65ca94ade7f 100644 --- a/light-clients/06-solomachine/types/header_test.go +++ b/light-clients/06-solomachine/types/header_test.go @@ -1,9 +1,9 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *SoloMachineTestSuite) TestHeaderValidateBasic() { diff --git a/light-clients/06-solomachine/types/misbehaviour.go b/light-clients/06-solomachine/types/misbehaviour.go index f5b218ccf20..d0d9bfe39aa 100644 --- a/light-clients/06-solomachine/types/misbehaviour.go +++ b/light-clients/06-solomachine/types/misbehaviour.go @@ -4,9 +4,9 @@ import ( "bytes" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.Misbehaviour = &Misbehaviour{} diff --git a/light-clients/06-solomachine/types/misbehaviour_handle.go b/light-clients/06-solomachine/types/misbehaviour_handle.go index ce5d6351c48..2306c47f0ad 100644 --- a/light-clients/06-solomachine/types/misbehaviour_handle.go +++ b/light-clients/06-solomachine/types/misbehaviour_handle.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // CheckMisbehaviourAndUpdateState determines whether or not the currently registered diff --git a/light-clients/06-solomachine/types/misbehaviour_handle_test.go b/light-clients/06-solomachine/types/misbehaviour_handle_test.go index 97ce22a3ed9..50b7523afe6 100644 --- a/light-clients/06-solomachine/types/misbehaviour_handle_test.go +++ b/light-clients/06-solomachine/types/misbehaviour_handle_test.go @@ -1,10 +1,10 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *SoloMachineTestSuite) TestCheckMisbehaviourAndUpdateState() { diff --git a/light-clients/06-solomachine/types/misbehaviour_test.go b/light-clients/06-solomachine/types/misbehaviour_test.go index 7c1f9168aaf..e8fc4d4f84a 100644 --- a/light-clients/06-solomachine/types/misbehaviour_test.go +++ b/light-clients/06-solomachine/types/misbehaviour_test.go @@ -1,9 +1,9 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *SoloMachineTestSuite) TestMisbehaviour() { diff --git a/light-clients/06-solomachine/types/proof.go b/light-clients/06-solomachine/types/proof.go index 6c2e0b84288..e4e1032e404 100644 --- a/light-clients/06-solomachine/types/proof.go +++ b/light-clients/06-solomachine/types/proof.go @@ -6,11 +6,11 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/types/multisig" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/tx/signing" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" ) // VerifySignature verifies if the the provided public key generated the signature diff --git a/light-clients/06-solomachine/types/proof_test.go b/light-clients/06-solomachine/types/proof_test.go index e2ba679a5b9..43e06b157d0 100644 --- a/light-clients/06-solomachine/types/proof_test.go +++ b/light-clients/06-solomachine/types/proof_test.go @@ -3,9 +3,9 @@ package types_test import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + solomachinetypes "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *SoloMachineTestSuite) TestVerifySignature() { diff --git a/light-clients/06-solomachine/types/proposal_handle.go b/light-clients/06-solomachine/types/proposal_handle.go index e38155b2361..269a914a46e 100644 --- a/light-clients/06-solomachine/types/proposal_handle.go +++ b/light-clients/06-solomachine/types/proposal_handle.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // CheckSubstituteAndUpdateState verifies that the subject is allowed to be updated by diff --git a/light-clients/06-solomachine/types/proposal_handle_test.go b/light-clients/06-solomachine/types/proposal_handle_test.go index 0113da10449..94f44c88ed4 100644 --- a/light-clients/06-solomachine/types/proposal_handle_test.go +++ b/light-clients/06-solomachine/types/proposal_handle_test.go @@ -1,10 +1,10 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *SoloMachineTestSuite) TestCheckSubstituteAndUpdateState() { diff --git a/light-clients/06-solomachine/types/solomachine.go b/light-clients/06-solomachine/types/solomachine.go index d3936ef4274..a49953a161d 100644 --- a/light-clients/06-solomachine/types/solomachine.go +++ b/light-clients/06-solomachine/types/solomachine.go @@ -3,7 +3,7 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // Interface implementation checks. diff --git a/light-clients/06-solomachine/types/solomachine_test.go b/light-clients/06-solomachine/types/solomachine_test.go index 50555e45145..deec20bef24 100644 --- a/light-clients/06-solomachine/types/solomachine_test.go +++ b/light-clients/06-solomachine/types/solomachine_test.go @@ -12,10 +12,10 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) type SoloMachineTestSuite struct { diff --git a/light-clients/06-solomachine/types/update.go b/light-clients/06-solomachine/types/update.go index 4cf31fd9885..5072d3b90a5 100644 --- a/light-clients/06-solomachine/types/update.go +++ b/light-clients/06-solomachine/types/update.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // CheckHeaderAndUpdateState checks if the provided header is valid and updates diff --git a/light-clients/06-solomachine/types/update_test.go b/light-clients/06-solomachine/types/update_test.go index e49992cbb55..e6170351261 100644 --- a/light-clients/06-solomachine/types/update_test.go +++ b/light-clients/06-solomachine/types/update_test.go @@ -3,10 +3,10 @@ package types_test import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *SoloMachineTestSuite) TestCheckHeaderAndUpdateState() { diff --git a/light-clients/07-tendermint/module.go b/light-clients/07-tendermint/module.go index 4c5cc2f947f..0fe57fa9320 100644 --- a/light-clients/07-tendermint/module.go +++ b/light-clients/07-tendermint/module.go @@ -1,7 +1,7 @@ package tendermint import ( - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) // Name returns the IBC client name diff --git a/light-clients/07-tendermint/types/client_state.go b/light-clients/07-tendermint/types/client_state.go index c2bb5239f5f..7550345496b 100644 --- a/light-clients/07-tendermint/types/client_state.go +++ b/light-clients/07-tendermint/types/client_state.go @@ -10,12 +10,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.ClientState = (*ClientState)(nil) diff --git a/light-clients/07-tendermint/types/client_state_test.go b/light-clients/07-tendermint/types/client_state_test.go index 744b4729f6e..84f9855118c 100644 --- a/light-clients/07-tendermint/types/client_state_test.go +++ b/light-clients/07-tendermint/types/client_state_test.go @@ -5,14 +5,14 @@ import ( ics23 "github.com/confio/ics23/go" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibcmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibcmock "github.com/cosmos/ibc-go/testing/mock" ) const ( diff --git a/light-clients/07-tendermint/types/codec.go b/light-clients/07-tendermint/types/codec.go index 5d876c8fe0e..33911b81750 100644 --- a/light-clients/07-tendermint/types/codec.go +++ b/light-clients/07-tendermint/types/codec.go @@ -2,7 +2,7 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // RegisterInterfaces registers the tendermint concrete client-related diff --git a/light-clients/07-tendermint/types/consensus_state.go b/light-clients/07-tendermint/types/consensus_state.go index adb469a3d10..775b078514e 100644 --- a/light-clients/07-tendermint/types/consensus_state.go +++ b/light-clients/07-tendermint/types/consensus_state.go @@ -7,9 +7,9 @@ import ( tmtypes "github.com/tendermint/tendermint/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" ) // NewConsensusState creates a new ConsensusState instance. diff --git a/light-clients/07-tendermint/types/consensus_state_test.go b/light-clients/07-tendermint/types/consensus_state_test.go index 313815d0c7b..5bcf8ec53f0 100644 --- a/light-clients/07-tendermint/types/consensus_state_test.go +++ b/light-clients/07-tendermint/types/consensus_state_test.go @@ -3,9 +3,9 @@ package types_test import ( "time" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) func (suite *TendermintTestSuite) TestConsensusStateValidateBasic() { diff --git a/light-clients/07-tendermint/types/genesis.go b/light-clients/07-tendermint/types/genesis.go index 7124643b55a..2c69d35d65f 100644 --- a/light-clients/07-tendermint/types/genesis.go +++ b/light-clients/07-tendermint/types/genesis.go @@ -2,8 +2,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // ExportMetadata exports all the processed times in the client store so they can be included in clients genesis diff --git a/light-clients/07-tendermint/types/genesis_test.go b/light-clients/07-tendermint/types/genesis_test.go index 5732151e63c..de7ce8281a0 100644 --- a/light-clients/07-tendermint/types/genesis_test.go +++ b/light-clients/07-tendermint/types/genesis_test.go @@ -4,9 +4,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) func (suite *TendermintTestSuite) TestExportMetadata() { diff --git a/light-clients/07-tendermint/types/header.go b/light-clients/07-tendermint/types/header.go index 0b9cfa1db1e..b346e6b2c6d 100644 --- a/light-clients/07-tendermint/types/header.go +++ b/light-clients/07-tendermint/types/header.go @@ -7,9 +7,9 @@ import ( tmtypes "github.com/tendermint/tendermint/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.Header = &Header{} diff --git a/light-clients/07-tendermint/types/header_test.go b/light-clients/07-tendermint/types/header_test.go index 97647f86140..a1a3222d5a3 100644 --- a/light-clients/07-tendermint/types/header_test.go +++ b/light-clients/07-tendermint/types/header_test.go @@ -5,9 +5,9 @@ import ( tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" ) func (suite *TendermintTestSuite) TestGetHeight() { diff --git a/light-clients/07-tendermint/types/misbehaviour.go b/light-clients/07-tendermint/types/misbehaviour.go index 340130d29fa..cc6c86b3e06 100644 --- a/light-clients/07-tendermint/types/misbehaviour.go +++ b/light-clients/07-tendermint/types/misbehaviour.go @@ -8,9 +8,9 @@ import ( tmtypes "github.com/tendermint/tendermint/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.Misbehaviour = &Misbehaviour{} diff --git a/light-clients/07-tendermint/types/misbehaviour_handle.go b/light-clients/07-tendermint/types/misbehaviour_handle.go index 4c55552d305..c538052774b 100644 --- a/light-clients/07-tendermint/types/misbehaviour_handle.go +++ b/light-clients/07-tendermint/types/misbehaviour_handle.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // CheckMisbehaviourAndUpdateState determines whether or not two conflicting diff --git a/light-clients/07-tendermint/types/misbehaviour_handle_test.go b/light-clients/07-tendermint/types/misbehaviour_handle_test.go index 3ca2e4dc119..e5b94da3591 100644 --- a/light-clients/07-tendermint/types/misbehaviour_handle_test.go +++ b/light-clients/07-tendermint/types/misbehaviour_handle_test.go @@ -7,12 +7,12 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" tmtypes "github.com/tendermint/tendermint/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibctestingmock "github.com/cosmos/ibc-go/testing/mock" ) func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { diff --git a/light-clients/07-tendermint/types/misbehaviour_test.go b/light-clients/07-tendermint/types/misbehaviour_test.go index dede4e6021a..4acb085ecec 100644 --- a/light-clients/07-tendermint/types/misbehaviour_test.go +++ b/light-clients/07-tendermint/types/misbehaviour_test.go @@ -7,11 +7,11 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibctestingmock "github.com/cosmos/ibc-go/testing/mock" ) func (suite *TendermintTestSuite) TestMisbehaviour() { diff --git a/light-clients/07-tendermint/types/proposal_handle.go b/light-clients/07-tendermint/types/proposal_handle.go index c64c52b3f81..080ee4c25e0 100644 --- a/light-clients/07-tendermint/types/proposal_handle.go +++ b/light-clients/07-tendermint/types/proposal_handle.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) // CheckSubstituteAndUpdateState will try to update the client with the state of the diff --git a/light-clients/07-tendermint/types/proposal_handle_test.go b/light-clients/07-tendermint/types/proposal_handle_test.go index 66a5120309c..5baf621af06 100644 --- a/light-clients/07-tendermint/types/proposal_handle_test.go +++ b/light-clients/07-tendermint/types/proposal_handle_test.go @@ -3,10 +3,10 @@ package types_test import ( "time" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) var ( diff --git a/light-clients/07-tendermint/types/store.go b/light-clients/07-tendermint/types/store.go index 7d6a841b89f..4c62eb95a5e 100644 --- a/light-clients/07-tendermint/types/store.go +++ b/light-clients/07-tendermint/types/store.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) // KeyProcessedTime is appended to consensus state key to store the processed time diff --git a/light-clients/07-tendermint/types/store_test.go b/light-clients/07-tendermint/types/store_test.go index b8badc09479..3bf235009b7 100644 --- a/light-clients/07-tendermint/types/store_test.go +++ b/light-clients/07-tendermint/types/store_test.go @@ -1,13 +1,13 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + solomachinetypes "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" ) func (suite *TendermintTestSuite) TestGetConsensusState() { diff --git a/light-clients/07-tendermint/types/tendermint_test.go b/light-clients/07-tendermint/types/tendermint_test.go index 4f9b8142bfb..be09ddb8ae0 100644 --- a/light-clients/07-tendermint/types/tendermint_test.go +++ b/light-clients/07-tendermint/types/tendermint_test.go @@ -12,10 +12,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibctestingmock "github.com/cosmos/ibc-go/testing/mock" ) const ( diff --git a/light-clients/07-tendermint/types/update.go b/light-clients/07-tendermint/types/update.go index e692e746686..da64ef876b2 100644 --- a/light-clients/07-tendermint/types/update.go +++ b/light-clients/07-tendermint/types/update.go @@ -10,9 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" ) // CheckHeaderAndUpdateState checks if the provided header is valid, and if valid it will: diff --git a/light-clients/07-tendermint/types/update_test.go b/light-clients/07-tendermint/types/update_test.go index d9e550ed015..9f89a0fbc95 100644 --- a/light-clients/07-tendermint/types/update_test.go +++ b/light-clients/07-tendermint/types/update_test.go @@ -5,11 +5,11 @@ import ( tmtypes "github.com/tendermint/tendermint/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - types "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + types "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/testing" + ibctestingmock "github.com/cosmos/ibc-go/testing/mock" ) func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { diff --git a/light-clients/07-tendermint/types/upgrade.go b/light-clients/07-tendermint/types/upgrade.go index 397e9cfd837..65017a2f735 100644 --- a/light-clients/07-tendermint/types/upgrade.go +++ b/light-clients/07-tendermint/types/upgrade.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/light-clients/07-tendermint/types/upgrade_test.go b/light-clients/07-tendermint/types/upgrade_test.go index 7be3a4943f3..f7a851a0492 100644 --- a/light-clients/07-tendermint/types/upgrade_test.go +++ b/light-clients/07-tendermint/types/upgrade_test.go @@ -1,10 +1,10 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/light-clients/09-localhost/module.go b/light-clients/09-localhost/module.go index 57b9c5bb263..68a592269f3 100644 --- a/light-clients/09-localhost/module.go +++ b/light-clients/09-localhost/module.go @@ -1,7 +1,7 @@ package localhost import ( - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" + "github.com/cosmos/ibc-go/light-clients/09-localhost/types" ) // Name returns the IBC client name diff --git a/light-clients/09-localhost/types/client_state.go b/light-clients/09-localhost/types/client_state.go index 5a4a41a1798..fdfc7a41f6d 100644 --- a/light-clients/09-localhost/types/client_state.go +++ b/light-clients/09-localhost/types/client_state.go @@ -11,11 +11,11 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var _ exported.ClientState = (*ClientState)(nil) diff --git a/light-clients/09-localhost/types/client_state_test.go b/light-clients/09-localhost/types/client_state_test.go index bc58f62539b..d46e63a8b49 100644 --- a/light-clients/09-localhost/types/client_state_test.go +++ b/light-clients/09-localhost/types/client_state_test.go @@ -2,14 +2,14 @@ package types_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + "github.com/cosmos/ibc-go/light-clients/09-localhost/types" ) const ( diff --git a/light-clients/09-localhost/types/codec.go b/light-clients/09-localhost/types/codec.go index b338dfb699a..a672323abc3 100644 --- a/light-clients/09-localhost/types/codec.go +++ b/light-clients/09-localhost/types/codec.go @@ -2,7 +2,7 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + "github.com/cosmos/ibc-go/core/exported" ) // RegisterInterfaces register the ibc interfaces submodule implementations to protobuf diff --git a/light-clients/09-localhost/types/localhost_test.go b/light-clients/09-localhost/types/localhost_test.go index 8ebaef843b0..73356dcdd24 100644 --- a/light-clients/09-localhost/types/localhost_test.go +++ b/light-clients/09-localhost/types/localhost_test.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + "github.com/cosmos/ibc-go/core/exported" ) const ( diff --git a/testing/chain.go b/testing/chain.go index 0534066d88d..69f0c94c715 100644 --- a/testing/chain.go +++ b/testing/chain.go @@ -25,16 +25,16 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - "github.com/cosmos/cosmos-sdk/x/ibc/core/types" - ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" - "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + ibctransfertypes "github.com/cosmos/ibc-go/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + "github.com/cosmos/ibc-go/core/types" + ibctmtypes "github.com/cosmos/ibc-go/light-clients/07-tendermint/types" + "github.com/cosmos/ibc-go/testing/mock" "github.com/cosmos/cosmos-sdk/x/staking/teststaking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) diff --git a/testing/chain_test.go b/testing/chain_test.go index 361a9c4c15a..5a30b0c6e80 100644 --- a/testing/chain_test.go +++ b/testing/chain_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" tmtypes "github.com/tendermint/tendermint/types" - ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" - "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + ibctesting "github.com/cosmos/ibc-go/testing" + "github.com/cosmos/ibc-go/testing/mock" ) func TestCreateSortedSignerArray(t *testing.T) { diff --git a/testing/coordinator.go b/testing/coordinator.go index ade28b4df34..282416abeb4 100644 --- a/testing/coordinator.go +++ b/testing/coordinator.go @@ -10,9 +10,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" ) var ( diff --git a/testing/mock/mock.go b/testing/mock/mock.go index 663497aa05c..97a03c8b987 100644 --- a/testing/mock/mock.go +++ b/testing/mock/mock.go @@ -18,8 +18,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" + host "github.com/cosmos/ibc-go/core/24-host" ) const ( diff --git a/testing/mock/privval_test.go b/testing/mock/privval_test.go index b9f0487a36d..b076f544272 100644 --- a/testing/mock/privval_test.go +++ b/testing/mock/privval_test.go @@ -7,7 +7,7 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" + "github.com/cosmos/ibc-go/testing/mock" ) const chainID = "testChain" diff --git a/testing/solomachine.go b/testing/solomachine.go index bee63785978..2d04a90410f 100644 --- a/testing/solomachine.go +++ b/testing/solomachine.go @@ -12,11 +12,11 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/crypto/types/multisig" "github.com/cosmos/cosmos-sdk/types/tx/signing" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" - solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" + clienttypes "github.com/cosmos/ibc-go/core/02-client/types" + commitmenttypes "github.com/cosmos/ibc-go/core/23-commitment/types" + host "github.com/cosmos/ibc-go/core/24-host" + "github.com/cosmos/ibc-go/core/exported" + solomachinetypes "github.com/cosmos/ibc-go/light-clients/06-solomachine/types" ) var prefix = commitmenttypes.NewMerklePrefix([]byte("ibc")) diff --git a/testing/types.go b/testing/types.go index 16cda6216b1..78231352907 100644 --- a/testing/types.go +++ b/testing/types.go @@ -1,7 +1,7 @@ package ibctesting import ( - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/core/04-channel/types" ) // TestConnection is a testing helper struct to keep track of the connectionID, source clientID,