From 2c93ec7a0c233a941f542045b47415b234b42223 Mon Sep 17 00:00:00 2001 From: Federico Kunze <31522760+fedekunze@users.noreply.github.com> Date: Fri, 2 Oct 2020 11:03:02 +0200 Subject: [PATCH] ibc: core restructure (#7434) * ibc: protobuf v1 * update codec * core client * core connection * core host * core commitment * core port * core channel * core ibc module files * core exported * core types & simulation * core spec * make proto-all * ibc alias --- CHANGELOG.md | 2 +- .../adr-025-ibc-passive-channels.md | 2 +- docs/ibc/custom.md | 4 +- docs/ibc/integration.md | 4 +- docs/ibc/overview.md | 12 +- docs/ibc/relayer.md | 2 +- proto/ibc/core/channel/v1/channel.proto | 2 +- proto/ibc/core/channel/v1/genesis.proto | 2 +- proto/ibc/core/channel/v1/query.proto | 2 +- proto/ibc/core/client/v1/client.proto | 2 +- proto/ibc/core/client/v1/genesis.proto | 2 +- proto/ibc/core/client/v1/query.proto | 2 +- proto/ibc/core/commitment/v1/commitment.proto | 2 +- proto/ibc/core/connection/v1/connection.proto | 2 +- proto/ibc/core/connection/v1/genesis.proto | 2 +- proto/ibc/core/connection/v1/query.proto | 2 +- proto/ibc/core/types/v1/genesis.proto | 2 +- simapp/app.go | 10 +- simapp/sim_test.go | 2 +- x/ibc/applications/transfer/client/cli/tx.go | 4 +- x/ibc/applications/transfer/handler_test.go | 4 +- x/ibc/applications/transfer/keeper/keeper.go | 4 +- x/ibc/applications/transfer/keeper/relay.go | 6 +- .../transfer/keeper/relay_test.go | 6 +- x/ibc/applications/transfer/module.go | 6 +- x/ibc/applications/transfer/module_test.go | 4 +- .../transfer/types/expected_keepers.go | 6 +- x/ibc/applications/transfer/types/genesis.go | 2 +- x/ibc/applications/transfer/types/msgs.go | 4 +- .../applications/transfer/types/msgs_test.go | 2 +- x/ibc/applications/transfer/types/trace.go | 2 +- .../transfer/types/transfer.pb.go | 2 +- x/ibc/{ => core}/02-client/abci.go | 4 +- x/ibc/{ => core}/02-client/abci_test.go | 6 +- x/ibc/{ => core}/02-client/client/cli/cli.go | 2 +- .../{ => core}/02-client/client/cli/query.go | 6 +- .../02-client/client/utils/utils.go | 10 +- x/ibc/{ => core}/02-client/doc.go | 0 x/ibc/{ => core}/02-client/genesis.go | 6 +- x/ibc/{ => core}/02-client/handler.go | 4 +- x/ibc/{ => core}/02-client/handler_test.go | 10 +- x/ibc/{ => core}/02-client/keeper/client.go | 4 +- .../02-client/keeper/client_test.go | 8 +- x/ibc/{ => core}/02-client/keeper/encoding.go | 4 +- .../{ => core}/02-client/keeper/grpc_query.go | 6 +- .../02-client/keeper/grpc_query_test.go | 6 +- x/ibc/{ => core}/02-client/keeper/keeper.go | 8 +- .../02-client/keeper/keeper_test.go | 8 +- x/ibc/{ => core}/02-client/keeper/proposal.go | 4 +- .../02-client/keeper/proposal_test.go | 6 +- x/ibc/{ => core}/02-client/module.go | 4 +- .../02-client/simulation/decoder.go | 6 +- .../02-client/simulation/decoder_test.go | 6 +- .../02-client/simulation/genesis.go | 2 +- x/ibc/{ => core}/02-client/types/client.go | 2 +- x/ibc/{ => core}/02-client/types/client.pb.go | 90 ++++----- .../{ => core}/02-client/types/client_test.go | 2 +- x/ibc/{ => core}/02-client/types/codec.go | 6 +- .../{ => core}/02-client/types/codec_test.go | 6 +- x/ibc/{ => core}/02-client/types/encoding.go | 2 +- x/ibc/{ => core}/02-client/types/errors.go | 0 x/ibc/{ => core}/02-client/types/events.go | 2 +- .../02-client/types/expected_keepers.go | 0 x/ibc/{ => core}/02-client/types/genesis.go | 4 +- .../{ => core}/02-client/types/genesis.pb.go | 44 ++--- .../02-client/types/genesis_test.go | 10 +- x/ibc/{ => core}/02-client/types/height.go | 2 +- .../{ => core}/02-client/types/height_test.go | 2 +- x/ibc/{ => core}/02-client/types/keys.go | 0 x/ibc/{ => core}/02-client/types/msgs.go | 4 +- x/ibc/{ => core}/02-client/types/msgs_test.go | 6 +- x/ibc/{ => core}/02-client/types/proposal.go | 2 +- .../02-client/types/proposal_test.go | 2 +- x/ibc/{ => core}/02-client/types/query.go | 4 +- x/ibc/{ => core}/02-client/types/query.pb.go | 98 +++++----- .../{ => core}/02-client/types/query.pb.gw.go | 0 .../03-connection/client/cli/cli.go | 2 +- .../03-connection/client/cli/query.go | 6 +- .../{ => core}/03-connection/client/cli/tx.go | 8 +- .../03-connection/client/utils/utils.go | 14 +- x/ibc/{ => core}/03-connection/genesis.go | 4 +- x/ibc/{ => core}/03-connection/handler.go | 6 +- .../03-connection/keeper/grpc_query.go | 6 +- .../03-connection/keeper/grpc_query_test.go | 8 +- .../03-connection/keeper/handshake.go | 8 +- .../03-connection/keeper/handshake_test.go | 8 +- .../{ => core}/03-connection/keeper/keeper.go | 10 +- .../03-connection/keeper/keeper_test.go | 2 +- .../{ => core}/03-connection/keeper/verify.go | 4 +- .../03-connection/keeper/verify_test.go | 10 +- x/ibc/{ => core}/03-connection/module.go | 4 +- .../03-connection/simulation/decoder.go | 4 +- .../03-connection/simulation/decoder_test.go | 6 +- .../03-connection/simulation/genesis.go | 2 +- x/ibc/{ => core}/03-connection/types/codec.go | 6 +- .../03-connection/types/connection.go | 6 +- .../03-connection/types/connection.pb.go | 138 +++++++------- .../03-connection/types/connection_test.go | 6 +- .../{ => core}/03-connection/types/errors.go | 0 .../{ => core}/03-connection/types/events.go | 2 +- .../03-connection/types/expected_keepers.go | 2 +- .../{ => core}/03-connection/types/genesis.go | 2 +- .../03-connection/types/genesis.pb.go | 10 +- .../03-connection/types/genesis_test.go | 6 +- x/ibc/{ => core}/03-connection/types/keys.go | 0 x/ibc/{ => core}/03-connection/types/msgs.go | 8 +- .../03-connection/types/msgs_test.go | 6 +- x/ibc/{ => core}/03-connection/types/query.go | 8 +- .../03-connection/types/query.pb.go | 116 ++++++------ .../03-connection/types/query.pb.gw.go | 0 .../{ => core}/03-connection/types/version.go | 0 .../03-connection/types/version_test.go | 2 +- x/ibc/{ => core}/04-channel/client/cli/cli.go | 2 +- .../{ => core}/04-channel/client/cli/query.go | 6 +- x/ibc/{ => core}/04-channel/client/cli/tx.go | 6 +- .../04-channel/client/utils/utils.go | 12 +- x/ibc/{ => core}/04-channel/genesis.go | 4 +- x/ibc/{ => core}/04-channel/handler.go | 4 +- .../04-channel/keeper/grpc_query.go | 8 +- .../04-channel/keeper/grpc_query_test.go | 8 +- .../{ => core}/04-channel/keeper/handshake.go | 10 +- .../04-channel/keeper/handshake_test.go | 10 +- x/ibc/{ => core}/04-channel/keeper/keeper.go | 6 +- .../04-channel/keeper/keeper_test.go | 2 +- x/ibc/{ => core}/04-channel/keeper/packet.go | 10 +- .../04-channel/keeper/packet_test.go | 8 +- x/ibc/{ => core}/04-channel/keeper/timeout.go | 8 +- .../04-channel/keeper/timeout_test.go | 8 +- x/ibc/{ => core}/04-channel/module.go | 4 +- .../04-channel/simulation/decoder.go | 4 +- .../04-channel/simulation/decoder_test.go | 6 +- .../04-channel/simulation/genesis.go | 2 +- x/ibc/{ => core}/04-channel/types/channel.go | 4 +- .../{ => core}/04-channel/types/channel.pb.go | 178 +++++++++--------- .../04-channel/types/channel_test.go | 2 +- x/ibc/{ => core}/04-channel/types/codec.go | 6 +- x/ibc/{ => core}/04-channel/types/errors.go | 0 x/ibc/{ => core}/04-channel/types/events.go | 2 +- .../04-channel/types/expected_keepers.go | 4 +- x/ibc/{ => core}/04-channel/types/genesis.go | 2 +- .../{ => core}/04-channel/types/genesis.pb.go | 56 +++--- .../04-channel/types/genesis_test.go | 2 +- x/ibc/{ => core}/04-channel/types/keys.go | 0 x/ibc/{ => core}/04-channel/types/msgs.go | 6 +- .../{ => core}/04-channel/types/msgs_test.go | 8 +- x/ibc/{ => core}/04-channel/types/packet.go | 6 +- .../04-channel/types/packet_test.go | 2 +- x/ibc/{ => core}/04-channel/types/query.go | 8 +- x/ibc/{ => core}/04-channel/types/query.pb.go | 177 ++++++++--------- .../04-channel/types/query.pb.gw.go | 0 x/ibc/{ => core}/05-port/keeper/keeper.go | 4 +- .../{ => core}/05-port/keeper/keeper_test.go | 2 +- x/ibc/{ => core}/05-port/types/errors.go | 0 x/ibc/{ => core}/05-port/types/keys.go | 0 x/ibc/{ => core}/05-port/types/module.go | 2 +- x/ibc/{ => core}/05-port/types/router.go | 0 x/ibc/{ => core}/05-port/types/utils.go | 0 x/ibc/{ => core}/23-commitment/types/codec.go | 6 +- .../23-commitment/types/commitment.pb.go | 58 +++--- .../23-commitment/types/commitment_test.go | 0 .../{ => core}/23-commitment/types/errors.go | 0 .../23-commitment/types/key_path.go | 0 .../{ => core}/23-commitment/types/merkle.go | 4 +- .../23-commitment/types/merkle_test.go | 2 +- x/ibc/{ => core}/24-host/errors.go | 0 x/ibc/{ => core}/24-host/keys.go | 2 +- x/ibc/{ => core}/24-host/parse.go | 0 x/ibc/{ => core}/24-host/validate.go | 0 x/ibc/{ => core}/24-host/validate_test.go | 0 x/ibc/{ => core}/client/cli/cli.go | 8 +- x/ibc/{ => core}/client/query.go | 6 +- x/ibc/{ => core}/exported/channel.go | 0 x/ibc/{ => core}/exported/client.go | 0 x/ibc/{ => core}/exported/commitment.go | 0 x/ibc/{ => core}/exported/connection.go | 0 x/ibc/{ => core}/genesis.go | 10 +- x/ibc/{ => core}/genesis_test.go | 16 +- x/ibc/{ => core}/handler.go | 16 +- x/ibc/{ => core}/handler_test.go | 8 +- x/ibc/{ => core}/ibc_test.go | 4 +- x/ibc/{ => core}/keeper/grpc_query.go | 6 +- x/ibc/{ => core}/keeper/keeper.go | 14 +- x/ibc/{ => core}/module.go | 18 +- x/ibc/{ => core}/simulation/decoder.go | 10 +- x/ibc/{ => core}/simulation/decoder_test.go | 10 +- x/ibc/{ => core}/simulation/genesis.go | 16 +- x/ibc/{ => core}/simulation/genesis_test.go | 6 +- x/ibc/{ => core}/spec/01_concepts.md | 0 x/ibc/{ => core}/spec/02_state.md | 0 x/ibc/{ => core}/spec/03_state_transitions.md | 0 x/ibc/{ => core}/spec/04_messages.md | 0 x/ibc/{ => core}/spec/05_callbacks.md | 2 +- x/ibc/{ => core}/spec/06_events.md | 0 x/ibc/{ => core}/spec/README.md | 12 +- x/ibc/{ => core}/types/codec.go | 8 +- x/ibc/{ => core}/types/genesis.go | 6 +- x/ibc/{ => core}/types/genesis.pb.go | 48 ++--- x/ibc/{ => core}/types/query.go | 12 +- .../06-solomachine/client/cli/tx.go | 2 +- .../06-solomachine/types/client_state.go | 8 +- .../06-solomachine/types/client_state_test.go | 10 +- .../06-solomachine/types/codec.go | 4 +- .../06-solomachine/types/codec_test.go | 6 +- .../06-solomachine/types/consensus_state.go | 4 +- .../06-solomachine/types/header.go | 4 +- .../06-solomachine/types/misbehaviour.go | 6 +- .../types/misbehaviour_handle.go | 4 +- .../types/misbehaviour_handle_test.go | 2 +- .../06-solomachine/types/proof.go | 10 +- .../06-solomachine/types/proposal_handle.go | 4 +- .../types/proposal_handle_test.go | 2 +- .../06-solomachine/types/solomachine.go | 2 +- .../06-solomachine/types/solomachine.pb.go | 4 +- .../06-solomachine/types/solomachine_test.go | 4 +- .../06-solomachine/types/update.go | 4 +- .../06-solomachine/types/update_test.go | 2 +- .../07-tendermint/client/cli/tx.go | 4 +- .../07-tendermint/types/client_state.go | 12 +- .../07-tendermint/types/client_state_test.go | 10 +- .../07-tendermint/types/codec.go | 2 +- .../07-tendermint/types/consensus_state.go | 6 +- .../types/consensus_state_test.go | 2 +- .../07-tendermint/types/header.go | 6 +- .../07-tendermint/types/header_test.go | 2 +- .../07-tendermint/types/misbehaviour.go | 6 +- .../types/misbehaviour_handle.go | 4 +- .../types/misbehaviour_handle_test.go | 6 +- .../07-tendermint/types/misbehaviour_test.go | 2 +- .../07-tendermint/types/proposal_handle.go | 4 +- .../types/proposal_handle_test.go | 2 +- .../07-tendermint/types/store.go | 6 +- .../07-tendermint/types/store_test.go | 8 +- .../07-tendermint/types/tendermint.pb.go | 4 +- .../07-tendermint/types/tendermint_test.go | 4 +- .../07-tendermint/types/test_utils.go | 2 +- .../07-tendermint/types/update.go | 6 +- .../07-tendermint/types/update_test.go | 4 +- .../07-tendermint/types/upgrade.go | 6 +- .../07-tendermint/types/upgrade_test.go | 4 +- .../09-localhost/types/client_state.go | 10 +- .../09-localhost/types/client_state_test.go | 10 +- .../light-clients/09-localhost/types/codec.go | 2 +- .../09-localhost/types/localhost.pb.go | 2 +- .../09-localhost/types/localhost_test.go | 4 +- x/ibc/testing/chain.go | 14 +- x/ibc/testing/coordinator.go | 6 +- x/ibc/testing/mock/mock.go | 4 +- x/ibc/testing/solomachine.go | 8 +- x/upgrade/abci_test.go | 2 +- x/upgrade/keeper/keeper.go | 4 +- x/upgrade/keeper/keeper_test.go | 4 +- x/upgrade/types/plan.go | 4 +- x/upgrade/types/plan_test.go | 2 +- 253 files changed, 1064 insertions(+), 1063 deletions(-) rename x/ibc/{ => core}/02-client/abci.go (79%) rename x/ibc/{ => core}/02-client/abci_test.go (88%) rename x/ibc/{ => core}/02-client/client/cli/cli.go (91%) rename x/ibc/{ => core}/02-client/client/cli/query.go (97%) rename x/ibc/{ => core}/02-client/client/utils/utils.go (94%) rename x/ibc/{ => core}/02-client/doc.go (100%) rename x/ibc/{ => core}/02-client/genesis.go (91%) rename x/ibc/{ => core}/02-client/handler.go (97%) rename x/ibc/{ => core}/02-client/handler_test.go (96%) rename x/ibc/{ => core}/02-client/keeper/client.go (97%) rename x/ibc/{ => core}/02-client/keeper/client_test.go (99%) rename x/ibc/{ => core}/02-client/keeper/encoding.go (93%) rename x/ibc/{ => core}/02-client/keeper/grpc_query.go (96%) rename x/ibc/{ => core}/02-client/keeper/grpc_query_test.go (97%) rename x/ibc/{ => core}/02-client/keeper/keeper.go (97%) rename x/ibc/{ => core}/02-client/keeper/keeper_test.go (98%) rename x/ibc/{ => core}/02-client/keeper/proposal.go (93%) rename x/ibc/{ => core}/02-client/keeper/proposal_test.go (94%) rename x/ibc/{ => core}/02-client/module.go (80%) rename x/ibc/{ => core}/02-client/simulation/decoder.go (89%) rename x/ibc/{ => core}/02-client/simulation/decoder_test.go (91%) rename x/ibc/{ => core}/02-client/simulation/genesis.go (82%) rename x/ibc/{ => core}/02-client/types/client.go (97%) rename x/ibc/{ => core}/02-client/types/client.pb.go (93%) rename x/ibc/{ => core}/02-client/types/client_test.go (95%) rename x/ibc/{ => core}/02-client/types/codec.go (97%) rename x/ibc/{ => core}/02-client/types/codec_test.go (96%) rename x/ibc/{ => core}/02-client/types/encoding.go (98%) rename x/ibc/{ => core}/02-client/types/errors.go (100%) rename x/ibc/{ => core}/02-client/types/events.go (91%) rename x/ibc/{ => core}/02-client/types/expected_keepers.go (100%) rename x/ibc/{ => core}/02-client/types/genesis.go (97%) rename x/ibc/{ => core}/02-client/types/genesis.pb.go (82%) rename x/ibc/{ => core}/02-client/types/genesis_test.go (95%) rename x/ibc/{ => core}/02-client/types/height.go (99%) rename x/ibc/{ => core}/02-client/types/height_test.go (98%) rename x/ibc/{ => core}/02-client/types/keys.go (100%) rename x/ibc/{ => core}/02-client/types/msgs.go (98%) rename x/ibc/{ => core}/02-client/types/msgs_test.go (98%) rename x/ibc/{ => core}/02-client/types/proposal.go (96%) rename x/ibc/{ => core}/02-client/types/proposal_test.go (97%) rename x/ibc/{ => core}/02-client/types/query.go (89%) rename x/ibc/{ => core}/02-client/types/query.pb.go (93%) rename x/ibc/{ => core}/02-client/types/query.pb.gw.go (100%) rename x/ibc/{ => core}/03-connection/client/cli/cli.go (94%) rename x/ibc/{ => core}/03-connection/client/cli/query.go (94%) rename x/ibc/{ => core}/03-connection/client/cli/tx.go (97%) rename x/ibc/{ => core}/03-connection/client/utils/utils.go (94%) rename x/ibc/{ => core}/03-connection/genesis.go (87%) rename x/ibc/{ => core}/03-connection/handler.go (96%) rename x/ibc/{ => core}/03-connection/keeper/grpc_query.go (96%) rename x/ibc/{ => core}/03-connection/keeper/grpc_query_test.go (97%) rename x/ibc/{ => core}/03-connection/keeper/handshake.go (97%) rename x/ibc/{ => core}/03-connection/keeper/handshake_test.go (99%) rename x/ibc/{ => core}/03-connection/keeper/keeper.go (94%) rename x/ibc/{ => core}/03-connection/keeper/keeper_test.go (98%) rename x/ibc/{ => core}/03-connection/keeper/verify.go (98%) rename x/ibc/{ => core}/03-connection/keeper/verify_test.go (98%) rename x/ibc/{ => core}/03-connection/module.go (83%) rename x/ibc/{ => core}/03-connection/simulation/decoder.go (90%) rename x/ibc/{ => core}/03-connection/simulation/decoder_test.go (89%) rename x/ibc/{ => core}/03-connection/simulation/genesis.go (82%) rename x/ibc/{ => core}/03-connection/types/codec.go (86%) rename x/ibc/{ => core}/03-connection/types/connection.go (95%) rename x/ibc/{ => core}/03-connection/types/connection.pb.go (93%) rename x/ibc/{ => core}/03-connection/types/connection_test.go (94%) rename x/ibc/{ => core}/03-connection/types/errors.go (100%) rename x/ibc/{ => core}/03-connection/types/events.go (92%) rename x/ibc/{ => core}/03-connection/types/expected_keepers.go (92%) rename x/ibc/{ => core}/03-connection/types/genesis.go (96%) rename x/ibc/{ => core}/03-connection/types/genesis.pb.go (97%) rename x/ibc/{ => core}/03-connection/types/genesis_test.go (92%) rename x/ibc/{ => core}/03-connection/types/keys.go (100%) rename x/ibc/{ => core}/03-connection/types/msgs.go (97%) rename x/ibc/{ => core}/03-connection/types/msgs_test.go (98%) rename x/ibc/{ => core}/03-connection/types/query.go (90%) rename x/ibc/{ => core}/03-connection/types/query.pb.go (93%) rename x/ibc/{ => core}/03-connection/types/query.pb.gw.go (100%) rename x/ibc/{ => core}/03-connection/types/version.go (100%) rename x/ibc/{ => core}/03-connection/types/version_test.go (99%) rename x/ibc/{ => core}/04-channel/client/cli/cli.go (95%) rename x/ibc/{ => core}/04-channel/client/cli/query.go (98%) rename x/ibc/{ => core}/04-channel/client/cli/tx.go (97%) rename x/ibc/{ => core}/04-channel/client/utils/utils.go (95%) rename x/ibc/{ => core}/04-channel/genesis.go (92%) rename x/ibc/{ => core}/04-channel/handler.go (98%) rename x/ibc/{ => core}/04-channel/keeper/grpc_query.go (98%) rename x/ibc/{ => core}/04-channel/keeper/grpc_query_test.go (99%) rename x/ibc/{ => core}/04-channel/keeper/handshake.go (97%) rename x/ibc/{ => core}/04-channel/keeper/handshake_test.go (98%) rename x/ibc/{ => core}/04-channel/keeper/keeper.go (98%) rename x/ibc/{ => core}/04-channel/keeper/keeper_test.go (99%) rename x/ibc/{ => core}/04-channel/keeper/packet.go (98%) rename x/ibc/{ => core}/04-channel/keeper/packet_test.go (99%) rename x/ibc/{ => core}/04-channel/keeper/timeout.go (97%) rename x/ibc/{ => core}/04-channel/keeper/timeout_test.go (98%) rename x/ibc/{ => core}/04-channel/module.go (83%) rename x/ibc/{ => core}/04-channel/simulation/decoder.go (93%) rename x/ibc/{ => core}/04-channel/simulation/decoder_test.go (92%) rename x/ibc/{ => core}/04-channel/simulation/genesis.go (82%) rename x/ibc/{ => core}/04-channel/types/channel.go (97%) rename x/ibc/{ => core}/04-channel/types/channel.pb.go (94%) rename x/ibc/{ => core}/04-channel/types/channel_test.go (96%) rename x/ibc/{ => core}/04-channel/types/codec.go (89%) rename x/ibc/{ => core}/04-channel/types/errors.go (100%) rename x/ibc/{ => core}/04-channel/types/events.go (96%) rename x/ibc/{ => core}/04-channel/types/expected_keepers.go (93%) rename x/ibc/{ => core}/04-channel/types/genesis.go (98%) rename x/ibc/{ => core}/04-channel/types/genesis.pb.go (88%) rename x/ibc/{ => core}/04-channel/types/genesis_test.go (98%) rename x/ibc/{ => core}/04-channel/types/keys.go (100%) rename x/ibc/{ => core}/04-channel/types/msgs.go (98%) rename x/ibc/{ => core}/04-channel/types/msgs_test.go (98%) rename x/ibc/{ => core}/04-channel/types/packet.go (95%) rename x/ibc/{ => core}/04-channel/types/packet_test.go (96%) rename x/ibc/{ => core}/04-channel/types/query.go (93%) rename x/ibc/{ => core}/04-channel/types/query.pb.go (95%) rename x/ibc/{ => core}/04-channel/types/query.pb.gw.go (100%) rename x/ibc/{ => core}/05-port/keeper/keeper.go (95%) rename x/ibc/{ => core}/05-port/keeper/keeper_test.go (97%) rename x/ibc/{ => core}/05-port/types/errors.go (100%) rename x/ibc/{ => core}/05-port/types/keys.go (100%) rename x/ibc/{ => core}/05-port/types/module.go (95%) rename x/ibc/{ => core}/05-port/types/router.go (100%) rename x/ibc/{ => core}/05-port/types/utils.go (100%) rename x/ibc/{ => core}/23-commitment/types/codec.go (86%) rename x/ibc/{ => core}/23-commitment/types/commitment.pb.go (91%) rename x/ibc/{ => core}/23-commitment/types/commitment_test.go (100%) rename x/ibc/{ => core}/23-commitment/types/errors.go (100%) rename x/ibc/{ => core}/23-commitment/types/key_path.go (100%) rename x/ibc/{ => core}/23-commitment/types/merkle.go (99%) rename x/ibc/{ => core}/23-commitment/types/merkle_test.go (99%) rename x/ibc/{ => core}/24-host/errors.go (100%) rename x/ibc/{ => core}/24-host/keys.go (99%) rename x/ibc/{ => core}/24-host/parse.go (100%) rename x/ibc/{ => core}/24-host/validate.go (100%) rename x/ibc/{ => core}/24-host/validate_test.go (100%) rename x/ibc/{ => core}/client/cli/cli.go (83%) rename x/ibc/{ => core}/client/query.go (90%) rename x/ibc/{ => core}/exported/channel.go (100%) rename x/ibc/{ => core}/exported/client.go (100%) rename x/ibc/{ => core}/exported/commitment.go (100%) rename x/ibc/{ => core}/exported/connection.go (100%) rename x/ibc/{ => core}/genesis.go (73%) rename x/ibc/{ => core}/genesis_test.go (94%) rename x/ibc/{ => core}/handler.go (95%) rename x/ibc/{ => core}/handler_test.go (99%) rename x/ibc/{ => core}/ibc_test.go (92%) rename x/ibc/{ => core}/keeper/grpc_query.go (96%) rename x/ibc/{ => core}/keeper/keeper.go (77%) rename x/ibc/{ => core}/module.go (91%) rename x/ibc/{ => core}/simulation/decoder.go (67%) rename x/ibc/{ => core}/simulation/decoder_test.go (85%) rename x/ibc/{ => core}/simulation/genesis.go (74%) rename x/ibc/{ => core}/simulation/genesis_test.go (89%) rename x/ibc/{ => core}/spec/01_concepts.md (100%) rename x/ibc/{ => core}/spec/02_state.md (100%) rename x/ibc/{ => core}/spec/03_state_transitions.md (100%) rename x/ibc/{ => core}/spec/04_messages.md (100%) rename x/ibc/{ => core}/spec/05_callbacks.md (94%) rename x/ibc/{ => core}/spec/06_events.md (100%) rename x/ibc/{ => core}/spec/README.md (92%) rename x/ibc/{ => core}/types/codec.go (72%) rename x/ibc/{ => core}/types/genesis.go (81%) rename x/ibc/{ => core}/types/genesis.pb.go (82%) rename x/ibc/{ => core}/types/query.go (57%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 113a3f95e4..f17ad52c47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -173,7 +173,7 @@ be used to retrieve the actual proposal `Content`. Also the `NewMsgSubmitProposa * (x/ibc) [\#5588](https://github.com/cosmos/cosmos-sdk/pull/5588) Add [ICS 024 - Host State Machine Requirements](https://github.com/cosmos/ics/tree/master/spec/ics-024-host-requirements) subpackage to `x/ibc` module. * (baseapp) [\#5803](https://github.com/cosmos/cosmos-sdk/pull/5803) Added support for taking state snapshots at regular height intervals, via options `snapshot-interval` and `snapshot-keep-recent`. * (store) [\#5803](https://github.com/cosmos/cosmos-sdk/pull/5803) Added `rootmulti.Store` methods for taking and restoring snapshots, based on `iavl.Store` export/import. -* (x/ibc) [\#5277](https://github.com/cosmos/cosmos-sdk/pull/5277) `x/ibc` changes from IBC alpha. For more details check the the [`x/ibc/spec`](https://github.com/cosmos/tree/master/x/ibc/spec) directory: +* (x/ibc) [\#5277](https://github.com/cosmos/cosmos-sdk/pull/5277) `x/ibc` changes from IBC alpha. For more details check the the [`x/ibc/core/spec`](https://github.com/cosmos/tree/master/x/ibc/core/spec) directory: * [ICS 002 - Client Semantics](https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics) subpackage * [ICS 003 - Connection Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-003-connection-semantics) subpackage * [ICS 004 - Channel and Packet Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-004-channel-and-packet-semantics) subpackage diff --git a/docs/architecture/adr-025-ibc-passive-channels.md b/docs/architecture/adr-025-ibc-passive-channels.md index 7209b61d3c..4f12a042ad 100644 --- a/docs/architecture/adr-025-ibc-passive-channels.md +++ b/docs/architecture/adr-025-ibc-passive-channels.md @@ -15,7 +15,7 @@ The current "naive" IBC Relayer strategy currently establishes a single predeter We wish to expand this "naive" strategy to a "passive" one which detects and relays both channel handshake messages and packets on a given connection, without the need to know each channel in advance of relaying it. -In order to accomplish this, we propose adding more comprehensive events to expose channel metadata for each transaction sent from the `x/ibc/04-channel/keeper/handshake.go` and `x/ibc/04-channel/keeper/packet.go` modules. +In order to accomplish this, we propose adding more comprehensive events to expose channel metadata for each transaction sent from the `x/ibc/core/04-channel/keeper/handshake.go` and `x/ibc/core/04-channel/keeper/packet.go` modules. Here is an example of what would be in `ChanOpenInit`: diff --git a/docs/ibc/custom.md b/docs/ibc/custom.md index 44c4c4851b..56d25cd14a 100644 --- a/docs/ibc/custom.md +++ b/docs/ibc/custom.md @@ -31,7 +31,7 @@ module correctly. ### Implement `IBCModule` Interface and callbacks The Cosmos SDK expects all IBC modules to implement the [`IBCModule` -interface](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/05-port/types/module.go). This +interface](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/05-port/types/module.go). This interface contains all of the callbacks IBC expects modules to implement. This section will describe the callbacks that are called during channel handshake execution. @@ -342,7 +342,7 @@ Thus, modules must agree on how to encode/decode acknowledgements. The process o acknowledgement struct along with encoding and decoding it, is very similar to the packet data example above. [ICS 04](https://github.com/cosmos/ics/tree/master/spec/ics-004-channel-and-packet-semantics#acknowledgement-envelope) specifies a recommended format for acknowledgements. This acknowledgement type can be imported from -[channel types](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/04-channel/types). +[channel types](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/04-channel/types). #### Acknowledging Packets diff --git a/docs/ibc/integration.md b/docs/ibc/integration.md index e3c2554997..50bc983f9b 100644 --- a/docs/ibc/integration.md +++ b/docs/ibc/integration.md @@ -120,7 +120,7 @@ IBC needs to know which module is bound to which port so that it can route packe appropriate module and call the appropriate callbacks. The port to module name mapping is handled by IBC's port `Keeper`. However, the mapping from module name to the relevant callbacks is accomplished by the port -[`Router`](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc//05-port/types/router.go) on the +[`Router`](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc//core/05-port/types/router.go) on the IBC module. Adding the module routes allows the IBC handler to call the appropriate callback when processing a @@ -204,7 +204,7 @@ past historical info at any given height in order to verify the light client `Co connection handhake. The IBC module also has -[`BeginBlock`](https://github.com/cosmos/cosmos-sdk/blob/master/x/ibc/02-client/abci.go) logic as +[`BeginBlock`](https://github.com/cosmos/cosmos-sdk/blob/master/x/ibc/core/02-client/abci.go) logic as well. This is optional as it is only required if your application uses the [localhost client](https://github.com/cosmos/ics/blob/master/spec/ics-009-loopback-client) to connect two different modules from the same chain. diff --git a/docs/ibc/overview.md b/docs/ibc/overview.md index 3f9580bb51..4f9154926e 100644 --- a/docs/ibc/overview.md +++ b/docs/ibc/overview.md @@ -26,7 +26,7 @@ module correctly. ## Components Overview -### [Clients](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/02-client) +### [Clients](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/02-client) IBC Clients are light clients (identified by a unique client-id) that track the consensus states of other blockchains, along with the proof spec necessary to properly verify proofs against the @@ -38,7 +38,7 @@ chains. The supported IBC clients are: * [Localhost (loopback) client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/light-clients/09-localhost): Useful for testing, simulation and relaying packets to modules on the same application. -### [Connections](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/03-connection) +### [Connections](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/03-connection) Connections encapsulate two `ConnectionEnd` objects on two seperate blockchains. Each `ConnectionEnd` is associated with a client of the other blockchain (ie counterparty blockchain). @@ -47,7 +47,7 @@ correct for their respective counterparties. Connections, once established, are facilitation all cross-chain verification of IBC state. A connection may be associated with any number of channels. -### [Proofs](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/23-commitment) and [Paths](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/24-host) +### [Proofs](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/23-commitment) and [Paths](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/24-host) In IBC, blockchains do not directly pass messages to each other over the network. Instead, to communicate, a blockchain will commit some state to a specifically defined path reserved for a @@ -82,7 +82,7 @@ IBC will correctly route all packets to the relevant module using the (channelID IBC module may also communicate with another IBC module over multiple ports, with each `(portID<->portID)` packet stream being sent on a different unique channel. -### [Ports](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/05-port) +### [Ports](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/05-port) An IBC module may bind to any number of ports. Each port must be identified by a unique `portID`. Since IBC is designed to be secure with mutually-distrusted modules operating on the same ledger, @@ -91,7 +91,7 @@ binding a port will return a dynamic object capability. In order to take action handler. This prevents a malicious module from opening channels with ports it does not own. Thus, IBC modules are responsible for claiming the capability that is returned on `BindPort`. -### [Channels](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/04-channel) +### [Channels](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/04-channel) An IBC channel can be established between 2 IBC ports. Currently, a port is exclusively owned by a single module. IBC packets are sent over channels. Just as IP packets contain the destination IP @@ -126,7 +126,7 @@ that the module **must** claim so that they can pass in a capability to authenti like sending packets. The channel capability is passed into the callback on the first parts of the handshake; either `OnChanOpenInit` on the initializing chain or `OnChanOpenTry` on the other chain. -### [Packets](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/04-channel) +### [Packets](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/04-channel) Modules communicate with each other by sending packets over IBC channels. As mentioned above, all IBC packets contain the destination `portID` and `channelID` along with the source `portID` and diff --git a/docs/ibc/relayer.md b/docs/ibc/relayer.md index 423a320770..155121258d 100644 --- a/docs/ibc/relayer.md +++ b/docs/ibc/relayer.md @@ -14,7 +14,7 @@ order: 4 Events are emitted for every transaction processed by the base application to indicate the execution of some logic clients may want to be aware of. This is extremely useful when relaying IBC packets. Any message that uses IBC will emit events for the corresponding TAO logic executed as defined in -the [IBC events spec](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/spec/06_events.md). +the [IBC events spec](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/core/spec/06_events.md). In the SDK, it can be assumed that for every message there is an event emitted with the type `message`, attribute key `action`, and an attribute value representing the type of message sent diff --git a/proto/ibc/core/channel/v1/channel.proto b/proto/ibc/core/channel/v1/channel.proto index eb57e65630..b014b7a202 100644 --- a/proto/ibc/core/channel/v1/channel.proto +++ b/proto/ibc/core/channel/v1/channel.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.channel.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"; import "gogoproto/gogo.proto"; import "ibc/core/client/v1/client.proto"; diff --git a/proto/ibc/core/channel/v1/genesis.proto b/proto/ibc/core/channel/v1/genesis.proto index 20f1a4c818..c7ff9b33f9 100644 --- a/proto/ibc/core/channel/v1/genesis.proto +++ b/proto/ibc/core/channel/v1/genesis.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.channel.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"; import "gogoproto/gogo.proto"; import "ibc/core/channel/v1/channel.proto"; diff --git a/proto/ibc/core/channel/v1/query.proto b/proto/ibc/core/channel/v1/query.proto index cb4361d4e2..13b14ce4c0 100644 --- a/proto/ibc/core/channel/v1/query.proto +++ b/proto/ibc/core/channel/v1/query.proto @@ -8,7 +8,7 @@ import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"; // Query provides defines the gRPC querier service service Query { diff --git a/proto/ibc/core/client/v1/client.proto b/proto/ibc/core/client/v1/client.proto index a4ca24c9a2..f6241439b8 100644 --- a/proto/ibc/core/client/v1/client.proto +++ b/proto/ibc/core/client/v1/client.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.client.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; diff --git a/proto/ibc/core/client/v1/genesis.proto b/proto/ibc/core/client/v1/genesis.proto index 5e44c5ffdc..1041ca9448 100644 --- a/proto/ibc/core/client/v1/genesis.proto +++ b/proto/ibc/core/client/v1/genesis.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.client.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"; import "ibc/core/client/v1/client.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/ibc/core/client/v1/query.proto b/proto/ibc/core/client/v1/query.proto index 513349afbc..25584b13bd 100644 --- a/proto/ibc/core/client/v1/query.proto +++ b/proto/ibc/core/client/v1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/any.proto"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"; // Query provides defines the gRPC querier service service Query { diff --git a/proto/ibc/core/commitment/v1/commitment.proto b/proto/ibc/core/commitment/v1/commitment.proto index 76c1f19af7..0ed6be0f25 100644 --- a/proto/ibc/core/commitment/v1/commitment.proto +++ b/proto/ibc/core/commitment/v1/commitment.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.commitment.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types"; import "gogoproto/gogo.proto"; import "tendermint/crypto/proof.proto"; diff --git a/proto/ibc/core/connection/v1/connection.proto b/proto/ibc/core/connection/v1/connection.proto index 726ca65f76..b65db3ff57 100644 --- a/proto/ibc/core/connection/v1/connection.proto +++ b/proto/ibc/core/connection/v1/connection.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.connection.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; diff --git a/proto/ibc/core/connection/v1/genesis.proto b/proto/ibc/core/connection/v1/genesis.proto index f811b12f53..4cc2ab7a5e 100644 --- a/proto/ibc/core/connection/v1/genesis.proto +++ b/proto/ibc/core/connection/v1/genesis.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.connection.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types"; import "gogoproto/gogo.proto"; import "ibc/core/connection/v1/connection.proto"; diff --git a/proto/ibc/core/connection/v1/query.proto b/proto/ibc/core/connection/v1/query.proto index 8b3ea80796..6a36a382b5 100644 --- a/proto/ibc/core/connection/v1/query.proto +++ b/proto/ibc/core/connection/v1/query.proto @@ -8,7 +8,7 @@ import "ibc/core/connection/v1/connection.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types"; // Query provides defines the gRPC querier service service Query { diff --git a/proto/ibc/core/types/v1/genesis.proto b/proto/ibc/core/types/v1/genesis.proto index 4f54d3e831..ace5085993 100644 --- a/proto/ibc/core/types/v1/genesis.proto +++ b/proto/ibc/core/types/v1/genesis.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ibc.core.types.v1; -option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/core/types"; import "gogoproto/gogo.proto"; import "ibc/core/client/v1/genesis.proto"; diff --git a/simapp/app.go b/simapp/app.go index fb3534a99d..9ba94183cd 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -54,14 +54,14 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/ibc" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/02-client" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types" - ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host" transfer "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer" ibctransferkeeper "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper" ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/keeper" + ibc "github.com/cosmos/cosmos-sdk/x/ibc/core" + ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" + porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" + ibchost "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper" ibcmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" "github.com/cosmos/cosmos-sdk/x/mint" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" diff --git a/simapp/sim_test.go b/simapp/sim_test.go index 3d74c68863..b1b28a9c51 100644 --- a/simapp/sim_test.go +++ b/simapp/sim_test.go @@ -24,8 +24,8 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host" ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" + ibchost "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/cosmos-sdk/x/simulation" diff --git a/x/ibc/applications/transfer/client/cli/tx.go b/x/ibc/applications/transfer/client/cli/tx.go index 2234fba029..4d39a9c29a 100644 --- a/x/ibc/applications/transfer/client/cli/tx.go +++ b/x/ibc/applications/transfer/client/cli/tx.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channelutils "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/client/utils" "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" ) const ( diff --git a/x/ibc/applications/transfer/handler_test.go b/x/ibc/applications/transfer/handler_test.go index 0c09a1cbbf..fd6b686fe2 100644 --- a/x/ibc/applications/transfer/handler_test.go +++ b/x/ibc/applications/transfer/handler_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/suite" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/applications/transfer/keeper/keeper.go b/x/ibc/applications/transfer/keeper/keeper.go index 809c3aeda6..c255606da0 100644 --- a/x/ibc/applications/transfer/keeper/keeper.go +++ b/x/ibc/applications/transfer/keeper/keeper.go @@ -13,9 +13,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" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" "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" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/ibc/applications/transfer/keeper/relay.go b/x/ibc/applications/transfer/keeper/relay.go index ef8fc63c93..91d703535f 100644 --- a/x/ibc/applications/transfer/keeper/relay.go +++ b/x/ibc/applications/transfer/keeper/relay.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" "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" ) // SendTransfer handles transfer sending logic. There are 2 possible cases: diff --git a/x/ibc/applications/transfer/keeper/relay_test.go b/x/ibc/applications/transfer/keeper/relay_test.go index cfeb588763..5bb7993f9c 100644 --- a/x/ibc/applications/transfer/keeper/relay_test.go +++ b/x/ibc/applications/transfer/keeper/relay_test.go @@ -4,10 +4,10 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" "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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/applications/transfer/module.go b/x/ibc/applications/transfer/module.go index 15614721f2..9e8830c1c7 100644 --- a/x/ibc/applications/transfer/module.go +++ b/x/ibc/applications/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" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" "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" ) var ( diff --git a/x/ibc/applications/transfer/module_test.go b/x/ibc/applications/transfer/module_test.go index e0a4a8e05f..308c998672 100644 --- a/x/ibc/applications/transfer/module_test.go +++ b/x/ibc/applications/transfer/module_test.go @@ -2,9 +2,9 @@ package transfer_test import ( capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" "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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/applications/transfer/types/expected_keepers.go b/x/ibc/applications/transfer/types/expected_keepers.go index 87d16c643f..284463350e 100644 --- a/x/ibc/applications/transfer/types/expected_keepers.go +++ b/x/ibc/applications/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/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // AccountKeeper defines the contract required for account APIs. diff --git a/x/ibc/applications/transfer/types/genesis.go b/x/ibc/applications/transfer/types/genesis.go index dd0b94f9f1..682b04c4cf 100644 --- a/x/ibc/applications/transfer/types/genesis.go +++ b/x/ibc/applications/transfer/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // NewGenesisState creates a new ibc-transfer GenesisState instance. diff --git a/x/ibc/applications/transfer/types/msgs.go b/x/ibc/applications/transfer/types/msgs.go index a75a214dd5..f5d31e0794 100644 --- a/x/ibc/applications/transfer/types/msgs.go +++ b/x/ibc/applications/transfer/types/msgs.go @@ -3,8 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // msg types diff --git a/x/ibc/applications/transfer/types/msgs_test.go b/x/ibc/applications/transfer/types/msgs_test.go index 05678fe2f2..be3320ba43 100644 --- a/x/ibc/applications/transfer/types/msgs_test.go +++ b/x/ibc/applications/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/02-client/types" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) // define constants used for testing diff --git a/x/ibc/applications/transfer/types/trace.go b/x/ibc/applications/transfer/types/trace.go index dabf64bf65..2e6ccded90 100644 --- a/x/ibc/applications/transfer/types/trace.go +++ b/x/ibc/applications/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/24-host" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // ParseDenomTrace parses a string with the ibc prefix (denom trace) and the base denomination diff --git a/x/ibc/applications/transfer/types/transfer.pb.go b/x/ibc/applications/transfer/types/transfer.pb.go index 79d3d4f6d6..281b1fc9f6 100644 --- a/x/ibc/applications/transfer/types/transfer.pb.go +++ b/x/ibc/applications/transfer/types/transfer.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - types1 "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + types1 "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" diff --git a/x/ibc/02-client/abci.go b/x/ibc/core/02-client/abci.go similarity index 79% rename from x/ibc/02-client/abci.go rename to x/ibc/core/02-client/abci.go index 7d90f0aa8b..3c56d90ad3 100644 --- a/x/ibc/02-client/abci.go +++ b/x/ibc/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/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // BeginBlocker updates an existing localhost client with the latest block height. diff --git a/x/ibc/02-client/abci_test.go b/x/ibc/core/02-client/abci_test.go similarity index 88% rename from x/ibc/02-client/abci_test.go rename to x/ibc/core/02-client/abci_test.go index a30516f2d0..33774b7c53 100644 --- a/x/ibc/02-client/abci_test.go +++ b/x/ibc/core/02-client/abci_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/suite" - client "github.com/cosmos/cosmos-sdk/x/ibc/02-client" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/02-client/client/cli/cli.go b/x/ibc/core/02-client/client/cli/cli.go similarity index 91% rename from x/ibc/02-client/client/cli/cli.go rename to x/ibc/core/02-client/client/cli/cli.go index 517a170c68..32aafc82c7 100644 --- a/x/ibc/02-client/client/cli/cli.go +++ b/x/ibc/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/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) // GetQueryCmd returns the query commands for IBC clients diff --git a/x/ibc/02-client/client/cli/query.go b/x/ibc/core/02-client/client/cli/query.go similarity index 97% rename from x/ibc/02-client/client/cli/query.go rename to x/ibc/core/02-client/client/cli/query.go index 42e39f3924..9d4ad4c19d 100644 --- a/x/ibc/02-client/client/cli/query.go +++ b/x/ibc/core/02-client/client/cli/query.go @@ -10,9 +10,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/02-client/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ) const ( diff --git a/x/ibc/02-client/client/utils/utils.go b/x/ibc/core/02-client/client/utils/utils.go similarity index 94% rename from x/ibc/02-client/client/utils/utils.go rename to x/ibc/core/02-client/client/utils/utils.go index d6d40e9ce4..53c8bf9844 100644 --- a/x/ibc/02-client/client/utils/utils.go +++ b/x/ibc/core/02-client/client/utils/utils.go @@ -9,11 +9,11 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/client" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" ) diff --git a/x/ibc/02-client/doc.go b/x/ibc/core/02-client/doc.go similarity index 100% rename from x/ibc/02-client/doc.go rename to x/ibc/core/02-client/doc.go diff --git a/x/ibc/02-client/genesis.go b/x/ibc/core/02-client/genesis.go similarity index 91% rename from x/ibc/02-client/genesis.go rename to x/ibc/core/02-client/genesis.go index eba0653622..cda4f7ed7f 100644 --- a/x/ibc/02-client/genesis.go +++ b/x/ibc/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/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" ) diff --git a/x/ibc/02-client/handler.go b/x/ibc/core/02-client/handler.go similarity index 97% rename from x/ibc/02-client/handler.go rename to x/ibc/core/02-client/handler.go index f824846001..030a4c7a93 100644 --- a/x/ibc/02-client/handler.go +++ b/x/ibc/core/02-client/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/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/keeper" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) // HandleMsgCreateClient defines the sdk.Handler for MsgCreateClient diff --git a/x/ibc/02-client/handler_test.go b/x/ibc/core/02-client/handler_test.go similarity index 96% rename from x/ibc/02-client/handler_test.go rename to x/ibc/core/02-client/handler_test.go index a44dd2bca5..d03ed03408 100644 --- a/x/ibc/02-client/handler_test.go +++ b/x/ibc/core/02-client/handler_test.go @@ -6,11 +6,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/02-client" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + client "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client" + "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" 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" diff --git a/x/ibc/02-client/keeper/client.go b/x/ibc/core/02-client/keeper/client.go similarity index 97% rename from x/ibc/02-client/keeper/client.go rename to x/ibc/core/02-client/keeper/client.go index 4ad5fc7717..2ade9f1ad8 100644 --- a/x/ibc/02-client/keeper/client.go +++ b/x/ibc/core/02-client/keeper/client.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // CreateClient creates a new client state and populates it with a given consensus diff --git a/x/ibc/02-client/keeper/client_test.go b/x/ibc/core/02-client/keeper/client_test.go similarity index 99% rename from x/ibc/02-client/keeper/client_test.go rename to x/ibc/core/02-client/keeper/client_test.go index e658c8652f..9cec0e8bcd 100644 --- a/x/ibc/02-client/keeper/client_test.go +++ b/x/ibc/core/02-client/keeper/client_test.go @@ -7,10 +7,10 @@ import ( tmtypes "github.com/tendermint/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" 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" diff --git a/x/ibc/02-client/keeper/encoding.go b/x/ibc/core/02-client/keeper/encoding.go similarity index 93% rename from x/ibc/02-client/keeper/encoding.go rename to x/ibc/core/02-client/keeper/encoding.go index 6bfd5eae76..f2a07b864d 100644 --- a/x/ibc/02-client/keeper/encoding.go +++ b/x/ibc/core/02-client/keeper/encoding.go @@ -1,8 +1,8 @@ package keeper import ( - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // UnmarshalClientState attempts to decode and return an ClientState object from diff --git a/x/ibc/02-client/keeper/grpc_query.go b/x/ibc/core/02-client/keeper/grpc_query.go similarity index 96% rename from x/ibc/02-client/keeper/grpc_query.go rename to x/ibc/core/02-client/keeper/grpc_query.go index 2514d6f499..ba9429264e 100644 --- a/x/ibc/02-client/keeper/grpc_query.go +++ b/x/ibc/core/02-client/keeper/grpc_query.go @@ -11,9 +11,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/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" ) var _ types.QueryServer = Keeper{} diff --git a/x/ibc/02-client/keeper/grpc_query_test.go b/x/ibc/core/02-client/keeper/grpc_query_test.go similarity index 97% rename from x/ibc/02-client/keeper/grpc_query_test.go rename to x/ibc/core/02-client/keeper/grpc_query_test.go index 6ea6925604..200a1d5ba0 100644 --- a/x/ibc/02-client/keeper/grpc_query_test.go +++ b/x/ibc/core/02-client/keeper/grpc_query_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" ) diff --git a/x/ibc/02-client/keeper/keeper.go b/x/ibc/core/02-client/keeper/keeper.go similarity index 97% rename from x/ibc/02-client/keeper/keeper.go rename to x/ibc/core/02-client/keeper/keeper.go index 4660a69148..d4422301bb 100644 --- a/x/ibc/02-client/keeper/keeper.go +++ b/x/ibc/core/02-client/keeper/keeper.go @@ -12,10 +12,10 @@ 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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/x/ibc/02-client/keeper/keeper_test.go b/x/ibc/core/02-client/keeper/keeper_test.go similarity index 98% rename from x/ibc/02-client/keeper/keeper_test.go rename to x/ibc/core/02-client/keeper/keeper_test.go index 9ce4bceca2..7dc6f54a58 100644 --- a/x/ibc/02-client/keeper/keeper_test.go +++ b/x/ibc/core/02-client/keeper/keeper_test.go @@ -15,10 +15,10 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" diff --git a/x/ibc/02-client/keeper/proposal.go b/x/ibc/core/02-client/keeper/proposal.go similarity index 93% rename from x/ibc/02-client/keeper/proposal.go rename to x/ibc/core/02-client/keeper/proposal.go index 92ce3bc63e..911b79be33 100644 --- a/x/ibc/02-client/keeper/proposal.go +++ b/x/ibc/core/02-client/keeper/proposal.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // ClientUpdateProposal will try to update the client with the new header if and only if diff --git a/x/ibc/02-client/keeper/proposal_test.go b/x/ibc/core/02-client/keeper/proposal_test.go similarity index 94% rename from x/ibc/02-client/keeper/proposal_test.go rename to x/ibc/core/02-client/keeper/proposal_test.go index fa6033a0a5..ea5cd372fa 100644 --- a/x/ibc/02-client/keeper/proposal_test.go +++ b/x/ibc/core/02-client/keeper/proposal_test.go @@ -1,9 +1,9 @@ package keeper_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" ) diff --git a/x/ibc/02-client/module.go b/x/ibc/core/02-client/module.go similarity index 80% rename from x/ibc/02-client/module.go rename to x/ibc/core/02-client/module.go index b3bb44edd2..9a051ba1ab 100644 --- a/x/ibc/02-client/module.go +++ b/x/ibc/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/02-client/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/client/cli" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) // Name returns the IBC client name diff --git a/x/ibc/02-client/simulation/decoder.go b/x/ibc/core/02-client/simulation/decoder.go similarity index 89% rename from x/ibc/02-client/simulation/decoder.go rename to x/ibc/core/02-client/simulation/decoder.go index 254f126131..c5c1f72fe9 100644 --- a/x/ibc/02-client/simulation/decoder.go +++ b/x/ibc/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/02-client/keeper" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" ) var _ ClientUnmarshaler = (*keeper.Keeper)(nil) diff --git a/x/ibc/02-client/simulation/decoder_test.go b/x/ibc/core/02-client/simulation/decoder_test.go similarity index 91% rename from x/ibc/02-client/simulation/decoder_test.go rename to x/ibc/core/02-client/simulation/decoder_test.go index cdfffcd9a1..e3b80549f4 100644 --- a/x/ibc/02-client/simulation/decoder_test.go +++ b/x/ibc/core/02-client/simulation/decoder_test.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/02-client/simulation/genesis.go b/x/ibc/core/02-client/simulation/genesis.go similarity index 82% rename from x/ibc/02-client/simulation/genesis.go rename to x/ibc/core/02-client/simulation/genesis.go index 314faab8c1..2f23197026 100644 --- a/x/ibc/02-client/simulation/genesis.go +++ b/x/ibc/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/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) // GenClientGenesis returns the default client genesis state. diff --git a/x/ibc/02-client/types/client.go b/x/ibc/core/02-client/types/client.go similarity index 97% rename from x/ibc/02-client/types/client.go rename to x/ibc/core/02-client/types/client.go index 8cf8e39bc7..99fe98e19e 100644 --- a/x/ibc/02-client/types/client.go +++ b/x/ibc/core/02-client/types/client.go @@ -6,7 +6,7 @@ import ( proto "github.com/gogo/protobuf/proto" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) var ( diff --git a/x/ibc/02-client/types/client.pb.go b/x/ibc/core/02-client/types/client.pb.go similarity index 93% rename from x/ibc/02-client/types/client.pb.go rename to x/ibc/core/02-client/types/client.pb.go index 9e50fbb855..a33771eb47 100644 --- a/x/ibc/02-client/types/client.pb.go +++ b/x/ibc/core/02-client/types/client.pb.go @@ -508,51 +508,51 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/client.proto", fileDescriptor_b6bc4c8185546947) } var fileDescriptor_b6bc4c8185546947 = []byte{ - // 692 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x3d, 0x4f, 0x1b, 0x3d, - 0x1c, 0x8f, 0x93, 0x3c, 0x11, 0x71, 0xc2, 0x8b, 0xee, 0x49, 0x20, 0x64, 0xc8, 0x45, 0x9e, 0x18, - 0xe0, 0xee, 0x21, 0xcf, 0x82, 0x22, 0x55, 0x6a, 0xc3, 0x52, 0xa4, 0x52, 0xa1, 0x43, 0x55, 0x5f, - 0x16, 0x74, 0x2f, 0xe6, 0x62, 0x35, 0x39, 0x47, 0x67, 0x5f, 0x44, 0xbe, 0x41, 0xc7, 0x4a, 0xad, - 0xaa, 0x0e, 0x1d, 0x98, 0x3a, 0x76, 0xeb, 0x37, 0xe8, 0xc0, 0xc8, 0xd8, 0xe9, 0x54, 0xc1, 0xd2, - 0xa9, 0x43, 0x3e, 0x41, 0x75, 0xb6, 0x69, 0x72, 0x40, 0x28, 0x62, 0x62, 0x3a, 0xdb, 0xff, 0xbf, - 0x7f, 0xfe, 0xbd, 0x58, 0x3e, 0xa8, 0x13, 0xc7, 0x35, 0x5d, 0x1a, 0x62, 0xd3, 0xed, 0x11, 0x1c, - 0x70, 0x73, 0xb8, 0xa9, 0x46, 0xc6, 0x20, 0xa4, 0x9c, 0x6a, 0x1a, 0x71, 0x5c, 0x23, 0x69, 0x30, - 0xd4, 0xf2, 0x70, 0xb3, 0x5e, 0xf1, 0xa9, 0x4f, 0x45, 0xd9, 0x4c, 0x46, 0xb2, 0xb3, 0xbe, 0xea, - 0x53, 0xea, 0xf7, 0xb0, 0x29, 0x66, 0x4e, 0x74, 0x68, 0xda, 0xc1, 0x48, 0x96, 0xd0, 0x27, 0x00, - 0xab, 0x3b, 0x1e, 0x0e, 0x38, 0x39, 0x24, 0xd8, 0xdb, 0x16, 0x40, 0xfb, 0xdc, 0xe6, 0x58, 0xdb, - 0x84, 0x45, 0x89, 0x7b, 0x40, 0xbc, 0x1a, 0x68, 0x82, 0xb5, 0x62, 0xa7, 0x32, 0x8e, 0xf5, 0xa5, - 0x91, 0xdd, 0xef, 0xb5, 0xd1, 0x9f, 0x12, 0xb2, 0xe6, 0xe4, 0x78, 0xc7, 0xd3, 0xf6, 0x60, 0x59, - 0xad, 0xb3, 0x04, 0xa2, 0x96, 0x6d, 0x82, 0xb5, 0x52, 0xab, 0x62, 0xc8, 0xe3, 0x8d, 0x8b, 0xe3, - 0x8d, 0x47, 0xc1, 0xa8, 0xb3, 0x32, 0x8e, 0xf5, 0x7f, 0x53, 0x58, 0x62, 0x0f, 0xb2, 0x4a, 0xee, - 0x84, 0x04, 0xfa, 0x02, 0x60, 0x6d, 0x9b, 0x06, 0x0c, 0x07, 0x2c, 0x62, 0x62, 0xe9, 0x39, 0xe1, - 0xdd, 0xc7, 0x98, 0xf8, 0x5d, 0xae, 0x6d, 0xc1, 0x42, 0x57, 0x8c, 0x04, 0xbd, 0x52, 0xab, 0x6e, - 0x5c, 0x75, 0xc4, 0x90, 0xbd, 0x9d, 0xfc, 0x49, 0xac, 0x67, 0x2c, 0xd5, 0xaf, 0xbd, 0x80, 0x8b, - 0xee, 0x05, 0xea, 0x2d, 0xb8, 0xae, 0x8e, 0x63, 0xbd, 0x9a, 0x70, 0x45, 0x97, 0x76, 0x21, 0x6b, - 0xc1, 0x4d, 0xb1, 0x43, 0xdf, 0x00, 0xac, 0x4a, 0x17, 0xd3, 0xb4, 0xd9, 0x5d, 0xfc, 0x3c, 0x82, - 0x4b, 0x97, 0x0e, 0x64, 0xb5, 0x6c, 0x33, 0xb7, 0x56, 0x6a, 0xad, 0x5f, 0x27, 0x75, 0x96, 0x51, - 0x1d, 0x3d, 0x11, 0x3f, 0x8e, 0xf5, 0x15, 0x75, 0xd6, 0x25, 0x4c, 0x64, 0x2d, 0xa6, 0x55, 0x30, - 0xf4, 0x15, 0xc0, 0x8a, 0x94, 0xf1, 0x6c, 0xe0, 0xd9, 0x1c, 0xef, 0x85, 0x74, 0x40, 0x99, 0xdd, - 0xd3, 0x2a, 0xf0, 0x1f, 0x4e, 0x78, 0x0f, 0x4b, 0x05, 0x96, 0x9c, 0x68, 0x4d, 0x58, 0xf2, 0x30, - 0x73, 0x43, 0x32, 0xe0, 0x84, 0x06, 0xc2, 0xcb, 0xa2, 0x35, 0xbd, 0x94, 0x56, 0x9f, 0xbb, 0x95, - 0xfa, 0xf5, 0x24, 0x5e, 0xdb, 0xc3, 0x61, 0x2d, 0x3f, 0x3b, 0x1b, 0x4b, 0xf5, 0xb4, 0xf3, 0x6f, - 0x8e, 0xf5, 0x0c, 0x7a, 0x97, 0x85, 0x8b, 0xbb, 0xcc, 0xdf, 0x0e, 0xb1, 0xcd, 0xb1, 0x14, 0x70, - 0x2f, 0x2e, 0xb2, 0xf6, 0xf2, 0xea, 0x8d, 0xcb, 0xdd, 0x00, 0x5a, 0x1f, 0xc7, 0xfa, 0xf2, 0xb5, - 0x69, 0x5d, 0xb9, 0x72, 0xda, 0x32, 0x2c, 0x30, 0xe2, 0x07, 0xca, 0xa7, 0xa2, 0xa5, 0x66, 0xed, - 0xb9, 0xc4, 0x91, 0x9f, 0x89, 0x2b, 0xef, 0x81, 0x70, 0x45, 0x46, 0x79, 0x77, 0x57, 0x26, 0x81, - 0x64, 0xff, 0x1e, 0xc8, 0x14, 0xad, 0xdc, 0x0c, 0x5a, 0xbf, 0x00, 0x5c, 0x12, 0xb4, 0xfc, 0xd0, - 0xf6, 0xee, 0x55, 0x5a, 0x0f, 0xe0, 0xfc, 0x20, 0xa4, 0xf4, 0xf0, 0x20, 0x92, 0xdc, 0x84, 0x84, - 0x72, 0xa7, 0x36, 0x8e, 0xf5, 0x8a, 0xdc, 0x9c, 0x2a, 0x23, 0xab, 0x2c, 0xe6, 0x4a, 0xc9, 0xac, - 0x44, 0xd0, 0x67, 0x00, 0xab, 0xbb, 0xcc, 0xdf, 0x8f, 0x9c, 0x3e, 0xe1, 0xbb, 0x84, 0x39, 0xb8, - 0x6b, 0x0f, 0x09, 0x8d, 0xc2, 0xbb, 0xa8, 0xde, 0x82, 0xe5, 0xfe, 0x14, 0xc4, 0x8d, 0x99, 0xa4, - 0x3a, 0x6f, 0x91, 0xcc, 0x07, 0x00, 0x0b, 0xea, 0x91, 0x7d, 0x08, 0x17, 0x86, 0x38, 0x64, 0x84, - 0x06, 0x07, 0x41, 0xd4, 0x77, 0x70, 0x28, 0xe8, 0xe5, 0x27, 0x6f, 0x62, 0x1b, 0xa5, 0xeb, 0xc8, - 0x9a, 0x57, 0x0b, 0x4f, 0xc5, 0x7c, 0x1a, 0x41, 0x3d, 0xd7, 0xd9, 0x59, 0x08, 0xb2, 0x3e, 0x41, - 0x90, 0x1c, 0x24, 0xb1, 0x8f, 0xc7, 0x7a, 0xa6, 0xf3, 0xe4, 0xe4, 0xac, 0x01, 0x4e, 0xcf, 0x1a, - 0xe0, 0xc7, 0x59, 0x03, 0xbc, 0x3d, 0x6f, 0x64, 0x4e, 0xcf, 0x1b, 0x99, 0xef, 0xe7, 0x8d, 0xcc, - 0xab, 0x96, 0x4f, 0x78, 0x37, 0x72, 0x0c, 0x97, 0xf6, 0x4d, 0x97, 0xb2, 0x3e, 0x65, 0xea, 0xb3, - 0xc1, 0xbc, 0xd7, 0xe6, 0x91, 0x99, 0xfc, 0x4d, 0xff, 0x6b, 0x6d, 0xa8, 0x7f, 0x29, 0x1f, 0x0d, - 0x30, 0x73, 0x0a, 0xc2, 0xa4, 0xff, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x5d, 0xb0, 0x8c, - 0x6b, 0x07, 0x00, 0x00, + // 691 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x3b, 0x4f, 0x1b, 0x31, + 0x1c, 0x8f, 0x93, 0x34, 0x22, 0x4e, 0x78, 0xe8, 0x9a, 0x40, 0xc8, 0x90, 0x8b, 0x3c, 0x31, 0xc0, + 0x5d, 0x49, 0x87, 0xa2, 0x48, 0x95, 0xda, 0xb0, 0x94, 0x81, 0x8a, 0x1e, 0xaa, 0xfa, 0x58, 0xd0, + 0x3d, 0xcc, 0xc5, 0x6a, 0x72, 0x8e, 0xce, 0x4e, 0x44, 0xbe, 0x41, 0xc7, 0x4a, 0xad, 0xaa, 0x0e, + 0x1d, 0x98, 0x3a, 0x76, 0xeb, 0x37, 0xe8, 0xc0, 0xc8, 0xd8, 0xe9, 0x54, 0xc1, 0xd2, 0xa9, 0x43, + 0x3e, 0x41, 0x75, 0xb6, 0x21, 0x39, 0x20, 0x14, 0x31, 0x31, 0x9d, 0xed, 0xff, 0xdf, 0x3f, 0xff, + 0x1e, 0x96, 0x0f, 0xea, 0xc4, 0x71, 0x4d, 0x97, 0x86, 0xd8, 0x74, 0x3b, 0x04, 0x07, 0xdc, 0x1c, + 0xac, 0xab, 0x91, 0xd1, 0x0b, 0x29, 0xa7, 0x9a, 0x46, 0x1c, 0xd7, 0x88, 0x1b, 0x0c, 0xb5, 0x3c, + 0x58, 0xaf, 0x96, 0x7c, 0xea, 0x53, 0x51, 0x36, 0xe3, 0x91, 0xec, 0xac, 0x2e, 0xfb, 0x94, 0xfa, + 0x1d, 0x6c, 0x8a, 0x99, 0xd3, 0xdf, 0x37, 0xed, 0x60, 0x28, 0x4b, 0xe8, 0x2b, 0x80, 0xe5, 0x2d, + 0x0f, 0x07, 0x9c, 0xec, 0x13, 0xec, 0x6d, 0x0a, 0xa0, 0x5d, 0x6e, 0x73, 0xac, 0xad, 0xc3, 0xbc, + 0xc4, 0xdd, 0x23, 0x5e, 0x05, 0xd4, 0xc1, 0x4a, 0xbe, 0x55, 0x1a, 0x45, 0xfa, 0xc2, 0xd0, 0xee, + 0x76, 0x9a, 0xe8, 0xbc, 0x84, 0xac, 0x19, 0x39, 0xde, 0xf2, 0xb4, 0x1d, 0x58, 0x54, 0xeb, 0x2c, + 0x86, 0xa8, 0xa4, 0xeb, 0x60, 0xa5, 0xd0, 0x28, 0x19, 0xf2, 0x78, 0xe3, 0xec, 0x78, 0xe3, 0x69, + 0x30, 0x6c, 0x2d, 0x8d, 0x22, 0xfd, 0x7e, 0x02, 0x4b, 0xec, 0x41, 0x56, 0xc1, 0x1d, 0x93, 0x40, + 0xdf, 0x01, 0xac, 0x6c, 0xd2, 0x80, 0xe1, 0x80, 0xf5, 0x99, 0x58, 0x7a, 0x45, 0x78, 0xfb, 0x19, + 0x26, 0x7e, 0x9b, 0x6b, 0x1b, 0x30, 0xd7, 0x16, 0x23, 0x41, 0xaf, 0xd0, 0xa8, 0x1a, 0x97, 0x1d, + 0x31, 0x64, 0x6f, 0x2b, 0x7b, 0x14, 0xe9, 0x29, 0x4b, 0xf5, 0x6b, 0xaf, 0xe1, 0xbc, 0x7b, 0x86, + 0x7a, 0x03, 0xae, 0xcb, 0xa3, 0x48, 0x2f, 0xc7, 0x5c, 0xd1, 0x85, 0x5d, 0xc8, 0x9a, 0x73, 0x13, + 0xec, 0xd0, 0x4f, 0x00, 0xcb, 0xd2, 0xc5, 0x24, 0x6d, 0x76, 0x1b, 0x3f, 0x0f, 0xe0, 0xc2, 0x85, + 0x03, 0x59, 0x25, 0x5d, 0xcf, 0xac, 0x14, 0x1a, 0xab, 0x57, 0x49, 0x9d, 0x66, 0x54, 0x4b, 0x8f, + 0xc5, 0x8f, 0x22, 0x7d, 0x49, 0x9d, 0x75, 0x01, 0x13, 0x59, 0xf3, 0x49, 0x15, 0x0c, 0xfd, 0x00, + 0xb0, 0x24, 0x65, 0xbc, 0xec, 0x79, 0x36, 0xc7, 0x3b, 0x21, 0xed, 0x51, 0x66, 0x77, 0xb4, 0x12, + 0xbc, 0xc7, 0x09, 0xef, 0x60, 0xa9, 0xc0, 0x92, 0x13, 0xad, 0x0e, 0x0b, 0x1e, 0x66, 0x6e, 0x48, + 0x7a, 0x9c, 0xd0, 0x40, 0x78, 0x99, 0xb7, 0x26, 0x97, 0x92, 0xea, 0x33, 0x37, 0x52, 0xbf, 0x1a, + 0xc7, 0x6b, 0x7b, 0x38, 0xac, 0x64, 0xa7, 0x67, 0x63, 0xa9, 0x9e, 0x66, 0xf6, 0xfd, 0xa1, 0x9e, + 0x42, 0x1f, 0xd3, 0x70, 0x7e, 0x9b, 0xf9, 0x9b, 0x21, 0xb6, 0x39, 0x96, 0x02, 0xee, 0xc4, 0x45, + 0xd6, 0xde, 0x5c, 0xbe, 0x71, 0x99, 0x6b, 0x40, 0xab, 0xa3, 0x48, 0x5f, 0xbc, 0x32, 0xad, 0x4b, + 0x57, 0x4e, 0x5b, 0x84, 0x39, 0x46, 0xfc, 0x40, 0xf9, 0x94, 0xb7, 0xd4, 0xac, 0x39, 0x13, 0x3b, + 0xf2, 0x27, 0x76, 0xe5, 0x13, 0x10, 0xae, 0xc8, 0x28, 0x6f, 0xef, 0xca, 0x38, 0x90, 0xf4, 0xff, + 0x03, 0x99, 0xa0, 0x95, 0x99, 0x42, 0xeb, 0x2f, 0x80, 0x0b, 0x82, 0x96, 0x1f, 0xda, 0xde, 0x9d, + 0x4a, 0xeb, 0x31, 0x9c, 0xed, 0x85, 0x94, 0xee, 0xef, 0xf5, 0x25, 0x37, 0x21, 0xa1, 0xd8, 0xaa, + 0x8c, 0x22, 0xbd, 0x24, 0x37, 0x27, 0xca, 0xc8, 0x2a, 0x8a, 0xb9, 0x52, 0x32, 0x2d, 0x11, 0xf4, + 0x0d, 0xc0, 0xf2, 0x36, 0xf3, 0x77, 0xfb, 0x4e, 0x97, 0xf0, 0x6d, 0xc2, 0x1c, 0xdc, 0xb6, 0x07, + 0x84, 0xf6, 0xc3, 0xdb, 0xa8, 0xde, 0x80, 0xc5, 0xee, 0x04, 0xc4, 0xb5, 0x99, 0x24, 0x3a, 0x6f, + 0x90, 0xcc, 0x67, 0x00, 0x73, 0xea, 0x91, 0x7d, 0x02, 0xe7, 0x06, 0x38, 0x64, 0x84, 0x06, 0x7b, + 0x41, 0xbf, 0xeb, 0xe0, 0x50, 0xd0, 0xcb, 0x8e, 0xdf, 0xc4, 0x26, 0x4a, 0xd6, 0x91, 0x35, 0xab, + 0x16, 0x9e, 0x8b, 0xf9, 0x24, 0x82, 0x7a, 0xae, 0xd3, 0xd3, 0x10, 0x64, 0x7d, 0x8c, 0x20, 0x39, + 0x48, 0x62, 0x5f, 0x0e, 0xf5, 0x54, 0xeb, 0xc5, 0xd1, 0x49, 0x0d, 0x1c, 0x9f, 0xd4, 0xc0, 0xef, + 0x93, 0x1a, 0xf8, 0x70, 0x5a, 0x4b, 0x1d, 0x9f, 0xd6, 0x52, 0xbf, 0x4e, 0x6b, 0xa9, 0xb7, 0x8f, + 0x7c, 0xc2, 0xdb, 0x7d, 0xc7, 0x70, 0x69, 0xd7, 0x74, 0x29, 0xeb, 0x52, 0xa6, 0x3e, 0x6b, 0xcc, + 0x7b, 0x67, 0x1e, 0x98, 0xe7, 0x7f, 0xd3, 0x07, 0x8d, 0x35, 0xf5, 0x43, 0xe5, 0xc3, 0x1e, 0x66, + 0x4e, 0x4e, 0x38, 0xf5, 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xe9, 0x8c, 0xf0, 0x70, + 0x07, 0x00, 0x00, } func (m *IdentifiedClientState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/02-client/types/client_test.go b/x/ibc/core/02-client/types/client_test.go similarity index 95% rename from x/ibc/02-client/types/client_test.go rename to x/ibc/core/02-client/types/client_test.go index 1652568fbd..3028980b89 100644 --- a/x/ibc/02-client/types/client_test.go +++ b/x/ibc/core/02-client/types/client_test.go @@ -1,7 +1,7 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/02-client/types/codec.go b/x/ibc/core/02-client/types/codec.go similarity index 97% rename from x/ibc/02-client/types/codec.go rename to x/ibc/core/02-client/types/codec.go index f1fec1fb77..5678c6bfd4 100644 --- a/x/ibc/02-client/types/codec.go +++ b/x/ibc/core/02-client/types/codec.go @@ -7,7 +7,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // RegisterInterfaces registers the client interfaces to protobuf Any. @@ -45,10 +45,10 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { } var ( - // SubModuleCdc references the global x/ibc/02-client module codec. Note, the codec should + // SubModuleCdc references the global x/ibc/core/02-client module codec. Note, the codec should // ONLY be used in certain instances of tests and for JSON encoding. // - // The actual codec used for serialization should be provided to x/ibc/02-client and + // The actual codec used for serialization should be provided to x/ibc/core/02-client and // defined at the application level. SubModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry()) ) diff --git a/x/ibc/02-client/types/codec_test.go b/x/ibc/core/02-client/types/codec_test.go similarity index 96% rename from x/ibc/02-client/types/codec_test.go rename to x/ibc/core/02-client/types/codec_test.go index 09690ec605..5464f9ae79 100644 --- a/x/ibc/02-client/types/codec_test.go +++ b/x/ibc/core/02-client/types/codec_test.go @@ -2,9 +2,9 @@ package types_test import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" diff --git a/x/ibc/02-client/types/encoding.go b/x/ibc/core/02-client/types/encoding.go similarity index 98% rename from x/ibc/02-client/types/encoding.go rename to x/ibc/core/02-client/types/encoding.go index 18c9943a63..1a56ad9596 100644 --- a/x/ibc/02-client/types/encoding.go +++ b/x/ibc/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/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // MustUnmarshalClientState attempts to decode and return an ClientState object from diff --git a/x/ibc/02-client/types/errors.go b/x/ibc/core/02-client/types/errors.go similarity index 100% rename from x/ibc/02-client/types/errors.go rename to x/ibc/core/02-client/types/errors.go diff --git a/x/ibc/02-client/types/events.go b/x/ibc/core/02-client/types/events.go similarity index 91% rename from x/ibc/02-client/types/events.go rename to x/ibc/core/02-client/types/events.go index 436fe02742..779e87cee3 100644 --- a/x/ibc/02-client/types/events.go +++ b/x/ibc/core/02-client/types/events.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // IBC client events diff --git a/x/ibc/02-client/types/expected_keepers.go b/x/ibc/core/02-client/types/expected_keepers.go similarity index 100% rename from x/ibc/02-client/types/expected_keepers.go rename to x/ibc/core/02-client/types/expected_keepers.go diff --git a/x/ibc/02-client/types/genesis.go b/x/ibc/core/02-client/types/genesis.go similarity index 97% rename from x/ibc/02-client/types/genesis.go rename to x/ibc/core/02-client/types/genesis.go index 451f54dc38..77efae936e 100644 --- a/x/ibc/02-client/types/genesis.go +++ b/x/ibc/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/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) var ( diff --git a/x/ibc/02-client/types/genesis.pb.go b/x/ibc/core/02-client/types/genesis.pb.go similarity index 82% rename from x/ibc/02-client/types/genesis.pb.go rename to x/ibc/core/02-client/types/genesis.pb.go index cb3624dd76..8d16b4519a 100644 --- a/x/ibc/02-client/types/genesis.pb.go +++ b/x/ibc/core/02-client/types/genesis.pb.go @@ -94,28 +94,28 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/genesis.proto", fileDescriptor_bcd0c0f1f2e6a91a) } var fileDescriptor_bcd0c0f1f2e6a91a = []byte{ - // 327 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x4e, 0xc2, 0x40, - 0x14, 0x86, 0x3b, 0x60, 0xd4, 0x54, 0x13, 0xb1, 0x31, 0xda, 0x60, 0x32, 0x25, 0x5d, 0xe1, 0x82, - 0x19, 0xc1, 0x1d, 0xcb, 0x92, 0x68, 0x48, 0x58, 0xe1, 0xce, 0x0d, 0x69, 0x87, 0xb1, 0x4c, 0x2c, - 0x1d, 0xc2, 0x1b, 0x88, 0xdc, 0xc2, 0x78, 0x0c, 0x0f, 0xe0, 0x19, 0x58, 0xb2, 0x74, 0x85, 0x06, - 0x6e, 0xc0, 0x09, 0x4c, 0x67, 0xca, 0x06, 0x74, 0x35, 0x2f, 0xff, 0xfc, 0xdf, 0xf7, 0x16, 0xcf, - 0xae, 0x88, 0x88, 0x51, 0x26, 0xc7, 0x9c, 0xb2, 0x44, 0xf0, 0x54, 0xd1, 0x69, 0x9d, 0xc6, 0x3c, - 0xe5, 0x20, 0x80, 0x8c, 0xc6, 0x52, 0x49, 0xc7, 0x11, 0x11, 0x23, 0x59, 0x83, 0x98, 0x06, 0x99, - 0xd6, 0xcb, 0xde, 0x1f, 0x54, 0xfe, 0xab, 0xa1, 0xf2, 0x45, 0x2c, 0x63, 0xa9, 0x47, 0x9a, 0x4d, - 0x26, 0xf5, 0x3f, 0x0b, 0xf6, 0xe9, 0x83, 0x91, 0x3f, 0xaa, 0x50, 0x71, 0xa7, 0x6d, 0x1f, 0x19, - 0x0c, 0x5c, 0x54, 0x29, 0x56, 0x4f, 0x1a, 0x37, 0x64, 0x7f, 0x1b, 0x69, 0xf7, 0x79, 0xaa, 0xc4, - 0xb3, 0xe0, 0xfd, 0x96, 0xce, 0x34, 0x1b, 0x1c, 0xcc, 0x97, 0x9e, 0xd5, 0xdd, 0xf2, 0xce, 0x3b, - 0xb2, 0xcf, 0xf3, 0xb9, 0xc7, 0x64, 0x0a, 0x3c, 0x85, 0x09, 0xb8, 0x85, 0xff, 0xad, 0xc6, 0xd5, - 0xda, 0x56, 0xb5, 0x14, 0x82, 0x66, 0x66, 0xdd, 0x2c, 0x3d, 0x77, 0x16, 0x0e, 0x93, 0xa6, 0xbf, - 0x67, 0xf4, 0x3f, 0xbe, 0xbd, 0x4b, 0x83, 0xc2, 0x0e, 0xdb, 0x2d, 0xb1, 0x9d, 0xdc, 0xb9, 0xb7, - 0x4b, 0x6c, 0xcc, 0x43, 0xc5, 0x7b, 0x89, 0x64, 0x61, 0x32, 0x90, 0xa0, 0xdc, 0x62, 0x05, 0x55, - 0x8f, 0x83, 0xeb, 0xcd, 0xd2, 0xbb, 0xca, 0x77, 0xec, 0x34, 0xfc, 0xee, 0x99, 0x89, 0x3a, 0xdb, - 0x24, 0xe8, 0xcc, 0x57, 0x18, 0x2d, 0x56, 0x18, 0xfd, 0xac, 0x30, 0x7a, 0x5b, 0x63, 0x6b, 0xb1, - 0xc6, 0xd6, 0xd7, 0x1a, 0x5b, 0x4f, 0x8d, 0x58, 0xa8, 0xc1, 0x24, 0x22, 0x4c, 0x0e, 0x29, 0x93, - 0x30, 0x94, 0x90, 0x3f, 0x35, 0xe8, 0xbf, 0xd0, 0x57, 0x9a, 0x1d, 0xea, 0xb6, 0x51, 0xcb, 0xcf, - 0xa4, 0x66, 0x23, 0x0e, 0xd1, 0xa1, 0xbe, 0xc6, 0xdd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, - 0x76, 0x39, 0x38, 0xfc, 0x01, 0x00, 0x00, + // 328 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x4c, 0x4a, 0xd6, + 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xc9, 0x4c, 0xcd, 0x2b, 0xd1, 0x2f, 0x33, 0xd4, 0x4f, + 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xca, 0x4c, + 0x4a, 0xd6, 0x03, 0xa9, 0xd0, 0x83, 0xa8, 0xd0, 0x2b, 0x33, 0x94, 0x92, 0xc7, 0xa2, 0x0b, 0x2a, + 0x0b, 0xd6, 0x24, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x66, 0xea, 0x83, 0x58, 0x10, 0x51, 0xa5, + 0x6d, 0x4c, 0x5c, 0x3c, 0xee, 0x10, 0xc3, 0x83, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0x3c, 0xb9, 0xd8, + 0x21, 0xda, 0x8a, 0x25, 0x18, 0x15, 0x98, 0x35, 0xb8, 0x8d, 0x34, 0xf5, 0x30, 0x6d, 0xd3, 0xf3, + 0x4c, 0x49, 0xcd, 0x2b, 0xc9, 0x4c, 0xcb, 0x4c, 0x4d, 0x71, 0x06, 0x8b, 0x81, 0xf5, 0x3a, 0xb1, + 0x9c, 0xb8, 0x27, 0xcf, 0x10, 0x04, 0xd3, 0x2f, 0x34, 0x89, 0x91, 0x4b, 0x10, 0xca, 0x8e, 0x4f, + 0xce, 0xcf, 0x2b, 0x4e, 0xcd, 0x2b, 0x2e, 0x2d, 0x96, 0x60, 0xc2, 0x6d, 0x2a, 0xc4, 0x2c, 0x67, + 0x98, 0x52, 0xb0, 0xa1, 0xc5, 0x4e, 0x56, 0x20, 0x53, 0x3f, 0xdd, 0x93, 0x97, 0xa8, 0x4c, 0xcc, + 0xcd, 0xb1, 0x52, 0xc2, 0x30, 0x51, 0x69, 0xd5, 0x7d, 0x79, 0x31, 0x88, 0xd6, 0x62, 0x34, 0xbd, + 0x41, 0x02, 0xc9, 0x68, 0xe2, 0x42, 0x6e, 0x5c, 0x02, 0xc9, 0x45, 0xa9, 0x89, 0x25, 0xa9, 0xf1, + 0x39, 0xf9, 0xc9, 0x89, 0x39, 0x19, 0xf9, 0xc5, 0x25, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0x1c, 0x4e, + 0xd2, 0x9f, 0xee, 0xc9, 0x8b, 0x43, 0xed, 0x40, 0x53, 0xa1, 0x14, 0xc4, 0x0f, 0x11, 0xf2, 0x81, + 0x89, 0x38, 0x05, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, + 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x79, 0x7a, + 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x72, 0x7e, 0x71, 0x6e, 0x7e, 0x31, + 0x94, 0xd2, 0x2d, 0x4e, 0xc9, 0xd6, 0xaf, 0xd0, 0x87, 0x47, 0x94, 0x81, 0x91, 0x2e, 0x34, 0xae, + 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x51, 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, + 0x5b, 0xe3, 0x61, 0x24, 0x01, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/02-client/types/genesis_test.go b/x/ibc/core/02-client/types/genesis_test.go similarity index 95% rename from x/ibc/02-client/types/genesis_test.go rename to x/ibc/core/02-client/types/genesis_test.go index 988d568c6e..e565205093 100644 --- a/x/ibc/02-client/types/genesis_test.go +++ b/x/ibc/core/02-client/types/genesis_test.go @@ -8,11 +8,11 @@ import ( tmtypes "github.com/tendermint/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - client "github.com/cosmos/cosmos-sdk/x/ibc/02-client" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" diff --git a/x/ibc/02-client/types/height.go b/x/ibc/core/02-client/types/height.go similarity index 99% rename from x/ibc/02-client/types/height.go rename to x/ibc/core/02-client/types/height.go index bc22abe3f4..488cf10185 100644 --- a/x/ibc/02-client/types/height.go +++ b/x/ibc/core/02-client/types/height.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) var _ exported.Height = (*Height)(nil) diff --git a/x/ibc/02-client/types/height_test.go b/x/ibc/core/02-client/types/height_test.go similarity index 98% rename from x/ibc/02-client/types/height_test.go rename to x/ibc/core/02-client/types/height_test.go index 22d099bd90..9d99a7def6 100644 --- a/x/ibc/02-client/types/height_test.go +++ b/x/ibc/core/02-client/types/height_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) func TestZeroHeight(t *testing.T) { diff --git a/x/ibc/02-client/types/keys.go b/x/ibc/core/02-client/types/keys.go similarity index 100% rename from x/ibc/02-client/types/keys.go rename to x/ibc/core/02-client/types/keys.go diff --git a/x/ibc/02-client/types/msgs.go b/x/ibc/core/02-client/types/msgs.go similarity index 98% rename from x/ibc/02-client/types/msgs.go rename to x/ibc/core/02-client/types/msgs.go index c33a35bf4e..deb16e020a 100644 --- a/x/ibc/02-client/types/msgs.go +++ b/x/ibc/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/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // message types for the IBC client diff --git a/x/ibc/02-client/types/msgs_test.go b/x/ibc/core/02-client/types/msgs_test.go similarity index 98% rename from x/ibc/02-client/types/msgs_test.go rename to x/ibc/core/02-client/types/msgs_test.go index 6ccaf1267e..6f6818dce1 100644 --- a/x/ibc/02-client/types/msgs_test.go +++ b/x/ibc/core/02-client/types/msgs_test.go @@ -7,9 +7,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types" diff --git a/x/ibc/02-client/types/proposal.go b/x/ibc/core/02-client/types/proposal.go similarity index 96% rename from x/ibc/02-client/types/proposal.go rename to x/ibc/core/02-client/types/proposal.go index 7f9abb004a..b91fd1d06c 100644 --- a/x/ibc/02-client/types/proposal.go +++ b/x/ibc/core/02-client/types/proposal.go @@ -2,7 +2,7 @@ package types import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) const ( diff --git a/x/ibc/02-client/types/proposal_test.go b/x/ibc/core/02-client/types/proposal_test.go similarity index 97% rename from x/ibc/02-client/types/proposal_test.go rename to x/ibc/core/02-client/types/proposal_test.go index bdb075201b..2cdbaec7f8 100644 --- a/x/ibc/02-client/types/proposal_test.go +++ b/x/ibc/core/02-client/types/proposal_test.go @@ -2,7 +2,7 @@ package types_test import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + "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" ) diff --git a/x/ibc/02-client/types/query.go b/x/ibc/core/02-client/types/query.go similarity index 89% rename from x/ibc/02-client/types/query.go rename to x/ibc/core/02-client/types/query.go index b26818c4b3..c629898ff5 100644 --- a/x/ibc/02-client/types/query.go +++ b/x/ibc/core/02-client/types/query.go @@ -4,8 +4,8 @@ import ( "strings" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // NewQueryClientStateResponse creates a new QueryClientStateResponse instance. diff --git a/x/ibc/02-client/types/query.pb.go b/x/ibc/core/02-client/types/query.pb.go similarity index 93% rename from x/ibc/02-client/types/query.pb.go rename to x/ibc/core/02-client/types/query.pb.go index f8ace98949..3b2c2612b8 100644 --- a/x/ibc/02-client/types/query.pb.go +++ b/x/ibc/core/02-client/types/query.pb.go @@ -532,55 +532,55 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/query.proto", fileDescriptor_dc42cdfd1d52d76e) } var fileDescriptor_dc42cdfd1d52d76e = []byte{ - // 766 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x5d, 0x4b, 0xdc, 0x4a, - 0x18, 0xde, 0xf1, 0xe3, 0xa0, 0xb3, 0xab, 0x1e, 0x06, 0xe1, 0xac, 0xd1, 0xb3, 0x7a, 0x56, 0x4e, - 0xab, 0xad, 0x3b, 0xe3, 0x6e, 0xe9, 0xc7, 0x4d, 0x2f, 0xaa, 0x60, 0x2b, 0x14, 0xb1, 0xe9, 0x45, - 0xa1, 0x50, 0x24, 0xc9, 0x8e, 0xd9, 0xa1, 0x9a, 0x89, 0x3b, 0xb3, 0x4b, 0x45, 0xbc, 0xf1, 0x17, - 0x14, 0x0a, 0xbd, 0xed, 0x1f, 0x28, 0xbd, 0xea, 0x6f, 0x28, 0xde, 0x14, 0xa4, 0x85, 0xd2, 0x8b, - 0x52, 0x8a, 0xf6, 0x87, 0x94, 0xcc, 0x4c, 0x34, 0xd1, 0x88, 0x69, 0x29, 0xf4, 0xca, 0xe4, 0xfd, - 0x7c, 0xde, 0xe7, 0x79, 0xf3, 0xba, 0xb0, 0xc2, 0x5c, 0x8f, 0x78, 0xbc, 0x4d, 0x89, 0xb7, 0xc1, - 0x68, 0x20, 0x49, 0xb7, 0x4e, 0xb6, 0x3a, 0xb4, 0xbd, 0x8d, 0xc3, 0x36, 0x97, 0x1c, 0x21, 0xe6, - 0x7a, 0x38, 0xf2, 0x63, 0xed, 0xc7, 0xdd, 0xba, 0x75, 0xc5, 0xe3, 0x62, 0x93, 0x0b, 0xe2, 0x3a, - 0x82, 0xea, 0x60, 0xd2, 0xad, 0xbb, 0x54, 0x3a, 0x75, 0x12, 0x3a, 0x3e, 0x0b, 0x1c, 0xc9, 0x78, - 0xa0, 0xf3, 0xad, 0xc9, 0x8c, 0xfa, 0xa6, 0x92, 0x0e, 0x18, 0xf3, 0x39, 0xf7, 0x37, 0x28, 0x51, - 0x6f, 0x6e, 0x67, 0x9d, 0x38, 0x81, 0xe9, 0x6d, 0x4d, 0x18, 0x97, 0x13, 0x32, 0xe2, 0x04, 0x01, - 0x97, 0xaa, 0xb0, 0x30, 0xde, 0x51, 0x9f, 0xfb, 0x5c, 0x3d, 0x92, 0xe8, 0x49, 0x5b, 0xab, 0x37, - 0xe0, 0x3f, 0x0f, 0x22, 0x44, 0x8b, 0xaa, 0xc7, 0x43, 0xe9, 0x48, 0x6a, 0xd3, 0xad, 0x0e, 0x15, - 0x12, 0x8d, 0xc3, 0x41, 0xdd, 0x79, 0x8d, 0x35, 0xcb, 0x60, 0x0a, 0xcc, 0x0c, 0xda, 0x03, 0xda, - 0xb0, 0xdc, 0xac, 0xbe, 0x07, 0xb0, 0x7c, 0x36, 0x51, 0x84, 0x3c, 0x10, 0x14, 0xdd, 0x84, 0x25, - 0x93, 0x29, 0x22, 0xbb, 0x4a, 0x2e, 0x36, 0x46, 0xb1, 0xc6, 0x87, 0x63, 0xe8, 0xf8, 0x4e, 0xb0, - 0x6d, 0x17, 0xbd, 0x93, 0x02, 0x68, 0x14, 0xf6, 0x87, 0x6d, 0xce, 0xd7, 0xcb, 0x3d, 0x53, 0x60, - 0xa6, 0x64, 0xeb, 0x17, 0xf4, 0x2f, 0x84, 0xea, 0x61, 0x2d, 0x74, 0x64, 0xab, 0xdc, 0xab, 0x90, - 0x0c, 0x2a, 0xcb, 0xaa, 0x23, 0x5b, 0x68, 0x11, 0x96, 0xb4, 0xbb, 0x45, 0x99, 0xdf, 0x92, 0xe5, - 0x3e, 0xd5, 0xcd, 0xc2, 0x67, 0x95, 0xc0, 0xf7, 0x54, 0xc4, 0x42, 0xdf, 0xfe, 0xd7, 0xc9, 0x82, - 0x5d, 0x54, 0x59, 0xda, 0x54, 0x75, 0xcf, 0x8e, 0x23, 0x62, 0x22, 0x96, 0x20, 0x3c, 0xd1, 0xc9, - 0x0c, 0x73, 0x09, 0x6b, 0x51, 0x71, 0x24, 0x2a, 0xd6, 0x1b, 0x60, 0x44, 0xc5, 0xab, 0x8e, 0x1f, - 0x93, 0x68, 0x27, 0x32, 0xab, 0x6f, 0x01, 0x1c, 0xcb, 0x68, 0x62, 0x48, 0x5b, 0x81, 0x43, 0x49, - 0xd2, 0x44, 0x19, 0x4c, 0xf5, 0xce, 0x14, 0x1b, 0xb3, 0x59, 0x73, 0x2c, 0x37, 0x69, 0x20, 0xd9, - 0x3a, 0xa3, 0xcd, 0x24, 0xfd, 0xa5, 0x04, 0x95, 0x02, 0xdd, 0x4d, 0xa1, 0xee, 0x51, 0xa8, 0x2f, - 0x5f, 0x88, 0x5a, 0x83, 0x49, 0xc1, 0x7e, 0x0d, 0xa0, 0xa5, 0x61, 0x47, 0xae, 0x40, 0x74, 0x44, - 0xee, 0x35, 0x41, 0xff, 0xc3, 0xe1, 0x2e, 0x6d, 0x0b, 0xc6, 0x83, 0xb5, 0xa0, 0xb3, 0xe9, 0xd2, - 0xb6, 0x02, 0xd2, 0x67, 0x0f, 0x19, 0xeb, 0x8a, 0x32, 0x26, 0xc3, 0x8c, 0x88, 0xbd, 0xa9, 0x30, - 0x2d, 0x12, 0x9a, 0x86, 0x43, 0x1b, 0xd1, 0x6c, 0x32, 0x29, 0xf5, 0x80, 0x5d, 0xd2, 0x46, 0xa3, - 0xe4, 0x27, 0x00, 0xc7, 0x33, 0xe1, 0x1a, 0x9e, 0x6f, 0xc3, 0x11, 0x2f, 0xf6, 0xe4, 0xd8, 0xcf, - 0x61, 0x2f, 0x55, 0xe6, 0x0f, 0xae, 0xe8, 0x5e, 0xf6, 0x60, 0x22, 0x97, 0x10, 0x4b, 0x19, 0xdb, - 0xf0, 0x2b, 0x3b, 0xfc, 0x0e, 0xc0, 0x89, 0x6c, 0x10, 0x86, 0xde, 0x27, 0xf0, 0xef, 0x53, 0xf4, - 0xc6, 0x9b, 0x3c, 0x97, 0x35, 0x6e, 0xba, 0xcc, 0x23, 0x26, 0x5b, 0x29, 0x02, 0x46, 0xd2, 0xec, - 0xff, 0xbe, 0xad, 0x6e, 0x7c, 0xe8, 0x87, 0xfd, 0x6a, 0x10, 0xf4, 0x0a, 0xc0, 0x62, 0xe2, 0x33, - 0x42, 0x57, 0xb3, 0x70, 0x9e, 0x73, 0x24, 0xad, 0xb9, 0x7c, 0xc1, 0x1a, 0x40, 0xf5, 0xfa, 0xde, - 0xc7, 0xef, 0x2f, 0x7a, 0x08, 0xaa, 0x11, 0x75, 0xe6, 0xe3, 0x0b, 0xaf, 0xff, 0x17, 0xa4, 0xbe, - 0x7e, 0xb2, 0x73, 0xac, 0xe5, 0x2e, 0x7a, 0x09, 0x60, 0x29, 0x79, 0x33, 0x50, 0xae, 0xae, 0xf1, - 0x62, 0x58, 0xb5, 0x9c, 0xd1, 0x06, 0xe4, 0xac, 0x02, 0x39, 0x8d, 0xfe, 0xbb, 0x10, 0x24, 0xfa, - 0x02, 0xe0, 0x70, 0x5a, 0x41, 0x84, 0xcf, 0x6f, 0x96, 0x75, 0x3e, 0x2c, 0x92, 0x3b, 0xde, 0xc0, - 0x63, 0x0a, 0x9e, 0x87, 0x9c, 0x4c, 0x78, 0xa7, 0x56, 0x2f, 0x49, 0x23, 0x31, 0xc7, 0x84, 0xec, - 0xa4, 0x4f, 0xd2, 0x2e, 0xd1, 0x5f, 0xe5, 0x89, 0x5d, 0xbf, 0xef, 0xa2, 0x37, 0x00, 0x8e, 0x9c, - 0xda, 0x73, 0x94, 0x17, 0xef, 0x31, 0xfb, 0xf3, 0xf9, 0x13, 0xcc, 0x84, 0xb7, 0xd4, 0x84, 0x0d, - 0x34, 0xff, 0xb3, 0x13, 0x2e, 0xdc, 0xdf, 0x3f, 0xac, 0x80, 0x83, 0xc3, 0x0a, 0xf8, 0x76, 0x58, - 0x01, 0xcf, 0x8f, 0x2a, 0x85, 0x83, 0xa3, 0x4a, 0xe1, 0xf3, 0x51, 0xa5, 0xf0, 0xb8, 0xe1, 0x33, - 0xd9, 0xea, 0xb8, 0xd8, 0xe3, 0x9b, 0xc4, 0xfc, 0x1c, 0xd1, 0x7f, 0x6a, 0xa2, 0xf9, 0x94, 0x3c, - 0x53, 0x9d, 0xe6, 0x1b, 0x35, 0xd3, 0x4c, 0x6e, 0x87, 0x54, 0xb8, 0x7f, 0xa9, 0x43, 0x78, 0xed, - 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x68, 0x9d, 0xe3, 0xec, 0xf4, 0x08, 0x00, 0x00, + // 765 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4f, 0x4f, 0x13, 0x41, + 0x14, 0xef, 0xf0, 0xc7, 0xc0, 0xb4, 0x80, 0x99, 0x90, 0x58, 0x16, 0x2c, 0x58, 0xa2, 0x82, 0xd2, + 0x19, 0x5a, 0xa3, 0x78, 0xf1, 0x20, 0x24, 0x28, 0x17, 0x02, 0xeb, 0xc1, 0xc4, 0xc4, 0x90, 0xdd, + 0xed, 0xb0, 0x9d, 0x08, 0x3b, 0xa5, 0x33, 0x6d, 0x24, 0x84, 0x0b, 0x9f, 0xc0, 0xc4, 0xc4, 0xab, + 0x5f, 0xc0, 0x78, 0xf2, 0x33, 0x18, 0x2e, 0x26, 0x44, 0x13, 0xe3, 0xc1, 0x18, 0x03, 0x7e, 0x10, + 0xb3, 0x33, 0xb3, 0xb0, 0x0b, 0x4b, 0x58, 0x8d, 0x89, 0xa7, 0xee, 0xbe, 0x3f, 0xf3, 0x7e, 0xef, + 0xf7, 0x7b, 0xf3, 0xba, 0xb0, 0xc4, 0x5c, 0x8f, 0x78, 0xbc, 0x45, 0x89, 0xb7, 0xc1, 0x68, 0x20, + 0x49, 0xa7, 0x4a, 0xb6, 0xda, 0xb4, 0xb5, 0x8d, 0x9b, 0x2d, 0x2e, 0x39, 0x42, 0xcc, 0xf5, 0x70, + 0xe8, 0xc7, 0xda, 0x8f, 0x3b, 0x55, 0xeb, 0x96, 0xc7, 0xc5, 0x26, 0x17, 0xc4, 0x75, 0x04, 0xd5, + 0xc1, 0xa4, 0x53, 0x75, 0xa9, 0x74, 0xaa, 0xa4, 0xe9, 0xf8, 0x2c, 0x70, 0x24, 0xe3, 0x81, 0xce, + 0xb7, 0xc6, 0x53, 0xce, 0x37, 0x27, 0xe9, 0x80, 0x11, 0x9f, 0x73, 0x7f, 0x83, 0x12, 0xf5, 0xe6, + 0xb6, 0xd7, 0x89, 0x13, 0x98, 0xda, 0xd6, 0x98, 0x71, 0x39, 0x4d, 0x46, 0x9c, 0x20, 0xe0, 0x52, + 0x1d, 0x2c, 0x8c, 0x77, 0xd8, 0xe7, 0x3e, 0x57, 0x8f, 0x24, 0x7c, 0xd2, 0xd6, 0xf2, 0x3d, 0x78, + 0x65, 0x35, 0x44, 0xb4, 0xa0, 0x6a, 0x3c, 0x91, 0x8e, 0xa4, 0x36, 0xdd, 0x6a, 0x53, 0x21, 0xd1, + 0x28, 0xec, 0xd7, 0x95, 0xd7, 0x58, 0xbd, 0x08, 0x26, 0xc0, 0x54, 0xbf, 0xdd, 0xa7, 0x0d, 0x4b, + 0xf5, 0xf2, 0x27, 0x00, 0x8b, 0x67, 0x13, 0x45, 0x93, 0x07, 0x82, 0xa2, 0x39, 0x58, 0x30, 0x99, + 0x22, 0xb4, 0xab, 0xe4, 0x7c, 0x6d, 0x18, 0x6b, 0x7c, 0x38, 0x82, 0x8e, 0x1f, 0x06, 0xdb, 0x76, + 0xde, 0x3b, 0x39, 0x00, 0x0d, 0xc3, 0xde, 0x66, 0x8b, 0xf3, 0xf5, 0x62, 0xd7, 0x04, 0x98, 0x2a, + 0xd8, 0xfa, 0x05, 0x5d, 0x85, 0x50, 0x3d, 0xac, 0x35, 0x1d, 0xd9, 0x28, 0x76, 0x2b, 0x24, 0xfd, + 0xca, 0xb2, 0xe2, 0xc8, 0x06, 0x5a, 0x80, 0x05, 0xed, 0x6e, 0x50, 0xe6, 0x37, 0x64, 0xb1, 0x47, + 0x55, 0xb3, 0xf0, 0x59, 0x25, 0xf0, 0x63, 0x15, 0x31, 0xdf, 0xb3, 0xff, 0x63, 0x3c, 0x67, 0xe7, + 0x55, 0x96, 0x36, 0x95, 0xdd, 0xb3, 0xed, 0x88, 0x88, 0x88, 0x45, 0x08, 0x4f, 0x74, 0x32, 0xcd, + 0xdc, 0xc0, 0x5a, 0x54, 0x1c, 0x8a, 0x8a, 0xf5, 0x04, 0x18, 0x51, 0xf1, 0x8a, 0xe3, 0x47, 0x24, + 0xda, 0xb1, 0xcc, 0xf2, 0x07, 0x00, 0x47, 0x52, 0x8a, 0x18, 0xd2, 0x96, 0xe1, 0x40, 0x9c, 0x34, + 0x51, 0x04, 0x13, 0xdd, 0x53, 0xf9, 0xda, 0x74, 0x5a, 0x1f, 0x4b, 0x75, 0x1a, 0x48, 0xb6, 0xce, + 0x68, 0x3d, 0x4e, 0x7f, 0x21, 0x46, 0xa5, 0x40, 0x8f, 0x12, 0xa8, 0xbb, 0x14, 0xea, 0x9b, 0x17, + 0xa2, 0xd6, 0x60, 0x12, 0xb0, 0xdf, 0x01, 0x68, 0x69, 0xd8, 0xa1, 0x2b, 0x10, 0x6d, 0x91, 0x79, + 0x4c, 0xd0, 0x75, 0x38, 0xd8, 0xa1, 0x2d, 0xc1, 0x78, 0xb0, 0x16, 0xb4, 0x37, 0x5d, 0xda, 0x52, + 0x40, 0x7a, 0xec, 0x01, 0x63, 0x5d, 0x56, 0xc6, 0x78, 0x98, 0x11, 0xb1, 0x3b, 0x11, 0xa6, 0x45, + 0x42, 0x93, 0x70, 0x60, 0x23, 0xec, 0x4d, 0xc6, 0xa5, 0xee, 0xb3, 0x0b, 0xda, 0x68, 0x94, 0xfc, + 0x0a, 0xe0, 0x68, 0x2a, 0x5c, 0xc3, 0xf3, 0x03, 0x38, 0xe4, 0x45, 0x9e, 0x0c, 0xf3, 0x39, 0xe8, + 0x25, 0x8e, 0xf9, 0x8f, 0x23, 0xba, 0x97, 0xde, 0x98, 0xc8, 0x24, 0xc4, 0x62, 0xca, 0x34, 0xfc, + 0xcd, 0x0c, 0x7f, 0x04, 0x70, 0x2c, 0x1d, 0x84, 0xa1, 0xf7, 0x39, 0xbc, 0x7c, 0x8a, 0xde, 0x68, + 0x92, 0x67, 0xd2, 0xda, 0x4d, 0x1e, 0xf3, 0x94, 0xc9, 0x46, 0x82, 0x80, 0xa1, 0x24, 0xfb, 0xff, + 0x6e, 0xaa, 0x6b, 0x9f, 0x7b, 0x61, 0xaf, 0x6a, 0x04, 0xbd, 0x05, 0x30, 0x1f, 0xbb, 0x46, 0xe8, + 0x76, 0x1a, 0xce, 0x73, 0x96, 0xa4, 0x35, 0x93, 0x2d, 0x58, 0x03, 0x28, 0xdf, 0xdd, 0xfb, 0xf2, + 0xeb, 0x75, 0x17, 0x41, 0x15, 0xa2, 0xd6, 0x7c, 0xb4, 0xe1, 0xf5, 0x7f, 0x41, 0xe2, 0xf6, 0x93, + 0x9d, 0x63, 0x2d, 0x77, 0xd1, 0x1b, 0x00, 0x0b, 0xf1, 0x9d, 0x81, 0x32, 0x55, 0x8d, 0x06, 0xc3, + 0xaa, 0x64, 0x8c, 0x36, 0x20, 0xa7, 0x15, 0xc8, 0x49, 0x74, 0xed, 0x42, 0x90, 0xe8, 0x3b, 0x80, + 0x83, 0x49, 0x05, 0x11, 0x3e, 0xbf, 0x58, 0xda, 0xfa, 0xb0, 0x48, 0xe6, 0x78, 0x03, 0x8f, 0x29, + 0x78, 0x1e, 0x72, 0x52, 0xe1, 0x9d, 0x1a, 0xbd, 0x38, 0x8d, 0xc4, 0x2c, 0x13, 0xb2, 0x93, 0x5c, + 0x49, 0xbb, 0x44, 0xdf, 0xca, 0x13, 0xbb, 0x7e, 0xdf, 0x45, 0xef, 0x01, 0x1c, 0x3a, 0x35, 0xe7, + 0x28, 0x2b, 0xde, 0x63, 0xf6, 0x67, 0xb3, 0x27, 0x98, 0x0e, 0xef, 0xab, 0x0e, 0x6b, 0x68, 0xf6, + 0x4f, 0x3b, 0x9c, 0x5f, 0xdd, 0x3f, 0x2c, 0x81, 0x83, 0xc3, 0x12, 0xf8, 0x79, 0x58, 0x02, 0xaf, + 0x8e, 0x4a, 0xb9, 0x83, 0xa3, 0x52, 0xee, 0xdb, 0x51, 0x29, 0xf7, 0x6c, 0xce, 0x67, 0xb2, 0xd1, + 0x76, 0xb1, 0xc7, 0x37, 0x89, 0xf9, 0x1c, 0xd1, 0x3f, 0x15, 0x51, 0x7f, 0x41, 0x5e, 0x92, 0xe3, + 0xcf, 0x8e, 0xd9, 0x5a, 0xc5, 0x54, 0x94, 0xdb, 0x4d, 0x2a, 0xdc, 0x4b, 0x6a, 0x1b, 0xde, 0xf9, + 0x1d, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x28, 0x91, 0xcd, 0xf9, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/02-client/types/query.pb.gw.go b/x/ibc/core/02-client/types/query.pb.gw.go similarity index 100% rename from x/ibc/02-client/types/query.pb.gw.go rename to x/ibc/core/02-client/types/query.pb.gw.go diff --git a/x/ibc/03-connection/client/cli/cli.go b/x/ibc/core/03-connection/client/cli/cli.go similarity index 94% rename from x/ibc/03-connection/client/cli/cli.go rename to x/ibc/core/03-connection/client/cli/cli.go index 84d1252e76..01bb6f9b11 100644 --- a/x/ibc/03-connection/client/cli/cli.go +++ b/x/ibc/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/03-connection/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ) // GetQueryCmd returns the query commands for IBC connections diff --git a/x/ibc/03-connection/client/cli/query.go b/x/ibc/core/03-connection/client/cli/query.go similarity index 94% rename from x/ibc/03-connection/client/cli/query.go rename to x/ibc/core/03-connection/client/cli/query.go index 4a6af2b78b..0beddb2f42 100644 --- a/x/ibc/03-connection/client/cli/query.go +++ b/x/ibc/core/03-connection/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/03-connection/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ) // GetCmdQueryConnections defines the command to query all the connection ends diff --git a/x/ibc/03-connection/client/cli/tx.go b/x/ibc/core/03-connection/client/cli/tx.go similarity index 97% rename from x/ibc/03-connection/client/cli/tx.go rename to x/ibc/core/03-connection/client/cli/tx.go index da08a9717d..e67ae94f42 100644 --- a/x/ibc/03-connection/client/cli/tx.go +++ b/x/ibc/core/03-connection/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/version" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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" ) const ( diff --git a/x/ibc/03-connection/client/utils/utils.go b/x/ibc/core/03-connection/client/utils/utils.go similarity index 94% rename from x/ibc/03-connection/client/utils/utils.go rename to x/ibc/core/03-connection/client/utils/utils.go index 986c8c43fa..87de8a720c 100644 --- a/x/ibc/03-connection/client/utils/utils.go +++ b/x/ibc/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/02-client/client/utils" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/client" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // QueryConnection returns a connection end. diff --git a/x/ibc/03-connection/genesis.go b/x/ibc/core/03-connection/genesis.go similarity index 87% rename from x/ibc/03-connection/genesis.go rename to x/ibc/core/03-connection/genesis.go index a9e721e25b..da8ffcd50d 100644 --- a/x/ibc/03-connection/genesis.go +++ b/x/ibc/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/03-connection/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/keeper" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ) // InitGenesis initializes the ibc connection submodule's state from a provided genesis diff --git a/x/ibc/03-connection/handler.go b/x/ibc/core/03-connection/handler.go similarity index 96% rename from x/ibc/03-connection/handler.go rename to x/ibc/core/03-connection/handler.go index f6a00e3be9..38afde96bd 100644 --- a/x/ibc/03-connection/handler.go +++ b/x/ibc/core/03-connection/handler.go @@ -3,9 +3,9 @@ package connection import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/keeper" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ) // HandleMsgConnectionOpenInit defines the sdk.Handler for MsgConnectionOpenInit diff --git a/x/ibc/03-connection/keeper/grpc_query.go b/x/ibc/core/03-connection/keeper/grpc_query.go similarity index 96% rename from x/ibc/03-connection/keeper/grpc_query.go rename to x/ibc/core/03-connection/keeper/grpc_query.go index d35e96303e..1c644e3da7 100644 --- a/x/ibc/03-connection/keeper/grpc_query.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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" ) var _ types.QueryServer = Keeper{} diff --git a/x/ibc/03-connection/keeper/grpc_query_test.go b/x/ibc/core/03-connection/keeper/grpc_query_test.go similarity index 97% rename from x/ibc/03-connection/keeper/grpc_query_test.go rename to x/ibc/core/03-connection/keeper/grpc_query_test.go index 9625483ee9..78fcd5225a 100644 --- a/x/ibc/03-connection/keeper/grpc_query_test.go +++ b/x/ibc/core/03-connection/keeper/grpc_query_test.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/03-connection/keeper/handshake.go b/x/ibc/core/03-connection/keeper/handshake.go similarity index 97% rename from x/ibc/03-connection/keeper/handshake.go rename to x/ibc/core/03-connection/keeper/handshake.go index b52639b3ac..1c91e6c434 100644 --- a/x/ibc/03-connection/keeper/handshake.go +++ b/x/ibc/core/03-connection/keeper/handshake.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // ConnOpenInit initialises a connection attempt on chain A. diff --git a/x/ibc/03-connection/keeper/handshake_test.go b/x/ibc/core/03-connection/keeper/handshake_test.go similarity index 99% rename from x/ibc/03-connection/keeper/handshake_test.go rename to x/ibc/core/03-connection/keeper/handshake_test.go index db47aad07e..b26ee28c8f 100644 --- a/x/ibc/03-connection/keeper/handshake_test.go +++ b/x/ibc/core/03-connection/keeper/handshake_test.go @@ -3,10 +3,10 @@ package keeper_test import ( "time" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/03-connection/keeper/keeper.go b/x/ibc/core/03-connection/keeper/keeper.go similarity index 94% rename from x/ibc/03-connection/keeper/keeper.go rename to x/ibc/core/03-connection/keeper/keeper.go index 54df91df75..c838b4fa6f 100644 --- a/x/ibc/03-connection/keeper/keeper.go +++ b/x/ibc/core/03-connection/keeper/keeper.go @@ -8,11 +8,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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // Keeper defines the IBC connection keeper diff --git a/x/ibc/03-connection/keeper/keeper_test.go b/x/ibc/core/03-connection/keeper/keeper_test.go similarity index 98% rename from x/ibc/03-connection/keeper/keeper_test.go rename to x/ibc/core/03-connection/keeper/keeper_test.go index a42684a482..85a22d6946 100644 --- a/x/ibc/03-connection/keeper/keeper_test.go +++ b/x/ibc/core/03-connection/keeper/keeper_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/03-connection/keeper/verify.go b/x/ibc/core/03-connection/keeper/verify.go similarity index 98% rename from x/ibc/03-connection/keeper/verify.go rename to x/ibc/core/03-connection/keeper/verify.go index 4c2ab3f81a..886ece6834 100644 --- a/x/ibc/03-connection/keeper/verify.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // VerifyClientState verifies a proof of a client state of the running machine diff --git a/x/ibc/03-connection/keeper/verify_test.go b/x/ibc/core/03-connection/keeper/verify_test.go similarity index 98% rename from x/ibc/03-connection/keeper/verify_test.go rename to x/ibc/core/03-connection/keeper/verify_test.go index 1cb3e619be..585b79feca 100644 --- a/x/ibc/03-connection/keeper/verify_test.go +++ b/x/ibc/core/03-connection/keeper/verify_test.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/03-connection/module.go b/x/ibc/core/03-connection/module.go similarity index 83% rename from x/ibc/03-connection/module.go rename to x/ibc/core/03-connection/module.go index 4c9e93d2ff..6100caa462 100644 --- a/x/ibc/03-connection/module.go +++ b/x/ibc/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/03-connection/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/client/cli" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ) // Name returns the IBC connection ICS name. diff --git a/x/ibc/03-connection/simulation/decoder.go b/x/ibc/core/03-connection/simulation/decoder.go similarity index 90% rename from x/ibc/03-connection/simulation/decoder.go rename to x/ibc/core/03-connection/simulation/decoder.go index 0b5079997e..4b2d3bdf88 100644 --- a/x/ibc/03-connection/simulation/decoder.go +++ b/x/ibc/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/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/ibc/03-connection/simulation/decoder_test.go b/x/ibc/core/03-connection/simulation/decoder_test.go similarity index 89% rename from x/ibc/03-connection/simulation/decoder_test.go rename to x/ibc/core/03-connection/simulation/decoder_test.go index b72943d08f..df13c8b5f0 100644 --- a/x/ibc/03-connection/simulation/decoder_test.go +++ b/x/ibc/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/03-connection/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ) func TestDecodeStore(t *testing.T) { diff --git a/x/ibc/03-connection/simulation/genesis.go b/x/ibc/core/03-connection/simulation/genesis.go similarity index 82% rename from x/ibc/03-connection/simulation/genesis.go rename to x/ibc/core/03-connection/simulation/genesis.go index 1d49ba57a0..43b0823776 100644 --- a/x/ibc/03-connection/simulation/genesis.go +++ b/x/ibc/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/03-connection/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ) // GenConnectionGenesis returns the default connection genesis state. diff --git a/x/ibc/03-connection/types/codec.go b/x/ibc/core/03-connection/types/codec.go similarity index 86% rename from x/ibc/03-connection/types/codec.go rename to x/ibc/core/03-connection/types/codec.go index f5c0da310a..dec4826210 100644 --- a/x/ibc/03-connection/types/codec.go +++ b/x/ibc/core/03-connection/types/codec.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // RegisterInterfaces register the ibc interfaces submodule implementations to protobuf @@ -36,10 +36,10 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { } var ( - // SubModuleCdc references the global x/ibc/03-connection module codec. Note, the codec should + // SubModuleCdc references the global x/ibc/core/03-connection module codec. Note, the codec should // ONLY be used in certain instances of tests and for JSON encoding. // - // The actual codec used for serialization should be provided to x/ibc/03-connectionl and + // The actual codec used for serialization should be provided to x/ibc/core/03-connectionl and // defined at the application level. SubModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry()) ) diff --git a/x/ibc/03-connection/types/connection.go b/x/ibc/core/03-connection/types/connection.go similarity index 95% rename from x/ibc/03-connection/types/connection.go rename to x/ibc/core/03-connection/types/connection.go index efb3bcd3d1..26fdcb49dd 100644 --- a/x/ibc/03-connection/types/connection.go +++ b/x/ibc/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/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var _ exported.ConnectionI = (*ConnectionEnd)(nil) diff --git a/x/ibc/03-connection/types/connection.pb.go b/x/ibc/core/03-connection/types/connection.pb.go similarity index 93% rename from x/ibc/03-connection/types/connection.pb.go rename to x/ibc/core/03-connection/types/connection.pb.go index ffb3fdccd7..1fdb03b52d 100644 --- a/x/ibc/03-connection/types/connection.pb.go +++ b/x/ibc/core/03-connection/types/connection.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" - types1 "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - types2 "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" + types1 "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + types2 "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" @@ -560,75 +560,75 @@ func init() { } var fileDescriptor_90572467c054e43a = []byte{ - // 1076 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x6f, 0x1a, 0x47, - 0x14, 0x67, 0x97, 0x3f, 0x86, 0x01, 0x27, 0x64, 0x8b, 0xed, 0xed, 0xb6, 0x61, 0xe9, 0xb6, 0x55, - 0xad, 0x4a, 0x59, 0x8a, 0x5d, 0xe5, 0x60, 0xa9, 0x07, 0x43, 0xa8, 0xba, 0x6a, 0x43, 0xd0, 0x1a, - 0x57, 0xaa, 0x2f, 0x08, 0x96, 0x01, 0x8f, 0x30, 0x3b, 0x68, 0x77, 0x41, 0xe1, 0x1b, 0x44, 0xbe, - 0xb4, 0x97, 0x1e, 0x7a, 0xb0, 0x14, 0xa9, 0x5f, 0xa4, 0xc7, 0xa8, 0xa7, 0xf4, 0xd6, 0x13, 0xaa, - 0xec, 0x4b, 0x7b, 0xe5, 0x13, 0x54, 0x33, 0xb3, 0xff, 0xf8, 0xa7, 0x2a, 0x81, 0x2a, 0x27, 0xe6, - 0xcd, 0xfb, 0xbd, 0x99, 0x79, 0xbf, 0xf9, 0xbd, 0x37, 0x0b, 0xf8, 0x0c, 0xb5, 0x8d, 0xa2, 0x81, - 0x2d, 0x58, 0x34, 0xb0, 0x69, 0x42, 0xc3, 0x41, 0xd8, 0x2c, 0x8e, 0x4b, 0x21, 0x4b, 0x1d, 0x5a, - 0xd8, 0xc1, 0xc2, 0x3e, 0x6a, 0x1b, 0x2a, 0x01, 0xaa, 0x21, 0xd7, 0xb8, 0x24, 0xe5, 0x7a, 0xb8, - 0x87, 0x29, 0xa4, 0x48, 0x46, 0x0c, 0x2d, 0xbd, 0xdf, 0xc3, 0xb8, 0x77, 0x05, 0x8b, 0xd4, 0x6a, - 0x8f, 0xba, 0xc5, 0x96, 0x39, 0x71, 0x5d, 0xe1, 0x1d, 0x07, 0x03, 0xe4, 0x0c, 0xa0, 0xe9, 0xb0, - 0x1d, 0x3d, 0xcb, 0x05, 0xca, 0x01, 0xf0, 0x0a, 0x79, 0x20, 0x3a, 0x62, 0x00, 0xe5, 0x67, 0x1e, - 0xec, 0x3d, 0xb5, 0x7b, 0x15, 0xff, 0x3c, 0xcf, 0x86, 0xd0, 0xd4, 0x4c, 0xe4, 0x08, 0x25, 0x90, - 0x62, 0xc8, 0x26, 0xea, 0x88, 0x5c, 0x81, 0x3b, 0x4c, 0x95, 0x73, 0xb3, 0xa9, 0x9c, 0x9d, 0xb4, - 0x06, 0x57, 0x27, 0x8a, 0xef, 0x52, 0xf4, 0x24, 0x1b, 0x6b, 0x1d, 0xe1, 0x2b, 0xb0, 0x1b, 0x24, - 0x46, 0xc2, 0x78, 0x1a, 0x26, 0xce, 0xa6, 0x72, 0xce, 0x0d, 0x0b, 0xbb, 0x15, 0x3d, 0x13, 0xd8, - 0x5a, 0x47, 0xa8, 0x81, 0x8c, 0x81, 0x47, 0xa6, 0x03, 0xad, 0x61, 0xcb, 0x72, 0x26, 0x62, 0xb4, - 0xc0, 0x1d, 0xa6, 0x8f, 0x3e, 0x51, 0x57, 0xb3, 0xa6, 0x56, 0x42, 0xd8, 0x72, 0xec, 0xd5, 0x54, - 0x8e, 0xe8, 0x73, 0xf1, 0x82, 0x08, 0x76, 0xc6, 0xd0, 0xb2, 0x11, 0x36, 0xc5, 0x18, 0x39, 0x88, - 0xee, 0x99, 0xc2, 0x3e, 0x48, 0xd8, 0xa8, 0x67, 0x42, 0x4b, 0x8c, 0x53, 0x87, 0x6b, 0x9d, 0x24, - 0x5f, 0xbc, 0x94, 0x23, 0x7f, 0xbf, 0x94, 0x23, 0xca, 0x1f, 0x09, 0x90, 0x5b, 0xe2, 0xa5, 0x61, - 0x4d, 0xde, 0x01, 0x2d, 0x25, 0x90, 0x1a, 0x5a, 0x78, 0x0c, 0x3b, 0x24, 0x34, 0xba, 0xb8, 0xa3, - 0xef, 0x52, 0xf4, 0x24, 0x1b, 0x6b, 0x1d, 0xa1, 0x0e, 0x32, 0xee, 0x49, 0x6c, 0xa7, 0xe5, 0x40, - 0x9a, 0x7e, 0xfa, 0x28, 0xa7, 0x32, 0x45, 0xa9, 0x9e, 0xa2, 0xd4, 0x53, 0x73, 0x52, 0x3e, 0x98, - 0x4d, 0xe5, 0xf7, 0xe6, 0x4e, 0x4f, 0x63, 0x14, 0x3d, 0xcd, 0xcc, 0x33, 0x62, 0x2d, 0xdd, 0x4d, - 0x7c, 0xc3, 0xbb, 0x39, 0x07, 0x7b, 0x61, 0xbb, 0xe9, 0xde, 0x8c, 0x2d, 0x26, 0x0a, 0xd1, 0xc3, - 0x54, 0xb9, 0x30, 0x9b, 0xca, 0x1f, 0x7a, 0xdc, 0xac, 0x80, 0x29, 0x7a, 0x2e, 0x3c, 0xff, 0xbd, - 0x3b, 0x2d, 0x5c, 0x80, 0xcc, 0xd0, 0xc2, 0xb8, 0xdb, 0xbc, 0x84, 0xa8, 0x77, 0xe9, 0x88, 0x3b, - 0xf4, 0x98, 0x52, 0xe8, 0x98, 0x4c, 0xfc, 0xe3, 0x92, 0xfa, 0x0d, 0x45, 0x94, 0x3f, 0x20, 0x87, - 0x0b, 0x28, 0x08, 0x47, 0x2b, 0x7a, 0x9a, 0x9a, 0x0c, 0x29, 0x7c, 0x09, 0x00, 0xf3, 0x22, 0x13, - 0x39, 0x62, 0xb2, 0xc0, 0x1d, 0x66, 0xca, 0x7b, 0xb3, 0xa9, 0xfc, 0x20, 0x1c, 0x49, 0x7c, 0x8a, - 0x9e, 0xa2, 0x06, 0x2d, 0xa3, 0x13, 0xef, 0x44, 0x6c, 0x67, 0x31, 0x45, 0xe3, 0x0e, 0x16, 0x77, - 0x64, 0x5e, 0x6f, 0xc7, 0x0a, 0xb5, 0x84, 0x0a, 0xb8, 0xef, 0x7a, 0xb1, 0x69, 0x43, 0xd3, 0x1e, - 0xd9, 0x22, 0xa0, 0xe1, 0xd2, 0x6c, 0x2a, 0xef, 0xcf, 0x85, 0x7b, 0x00, 0x45, 0xbf, 0xc7, 0x56, - 0xf0, 0x26, 0x84, 0x2e, 0xc8, 0xfa, 0x5e, 0x8f, 0x96, 0xf4, 0x7f, 0xd2, 0x22, 0xbb, 0xb4, 0x1c, - 0xf8, 0x02, 0x9d, 0x5b, 0x41, 0xd1, 0xef, 0xfb, 0x53, 0x2e, 0x3d, 0x41, 0x4d, 0x65, 0xd6, 0xd4, - 0xd4, 0x6f, 0xf1, 0x15, 0x35, 0x75, 0x6a, 0xf4, 0x97, 0x0b, 0x84, 0x7b, 0xa3, 0x02, 0x31, 0x80, - 0x34, 0x27, 0x92, 0x55, 0xc5, 0xf6, 0xe9, 0x6c, 0x2a, 0x7f, 0xb4, 0x42, 0x50, 0x0b, 0x0b, 0x8b, - 0x61, 0x67, 0x25, 0xbc, 0x49, 0xa8, 0x99, 0x44, 0xe7, 0x9b, 0xc9, 0xf6, 0x8b, 0x6d, 0x51, 0xc5, - 0xf1, 0x2d, 0xaa, 0x98, 0x75, 0x13, 0xdc, 0x6d, 0x3a, 0xd6, 0x44, 0x4c, 0x50, 0x35, 0xcd, 0x77, - 0x13, 0xe6, 0x62, 0xdd, 0x04, 0x77, 0x49, 0xcb, 0x5b, 0x94, 0xf0, 0xce, 0x66, 0x12, 0x4e, 0x6e, - 0x45, 0xc2, 0xa9, 0xff, 0x55, 0xc2, 0x60, 0x8d, 0x84, 0xaf, 0x79, 0x20, 0x2e, 0x49, 0xb8, 0x82, - 0xcd, 0x2e, 0xb2, 0x06, 0x9b, 0xca, 0xd8, 0xbf, 0x99, 0x96, 0xd1, 0xa7, 0xaa, 0x5d, 0x71, 0x33, - 0x2d, 0xa3, 0xef, 0xdd, 0x0c, 0x29, 0x9c, 0x45, 0xa1, 0x44, 0xb7, 0x28, 0x94, 0x80, 0x8c, 0xd8, - 0x1a, 0x32, 0xfe, 0xe1, 0xc0, 0x6e, 0xc0, 0x44, 0xd5, 0xec, 0xbc, 0xcd, 0xe3, 0x28, 0x81, 0xa4, - 0xdf, 0xfb, 0x79, 0xd2, 0xfb, 0x75, 0xdf, 0x16, 0x8e, 0x41, 0x9c, 0x95, 0x14, 0xc9, 0xeb, 0xde, - 0xd1, 0xc3, 0x75, 0xaf, 0x0d, 0xad, 0x1a, 0x9d, 0x61, 0x97, 0x5e, 0xaa, 0xd8, 0x66, 0x2f, 0xd5, - 0x49, 0x8c, 0xe4, 0xab, 0xfc, 0xc8, 0x83, 0x9c, 0xd6, 0x81, 0xa6, 0x83, 0xba, 0x08, 0x76, 0x82, - 0xac, 0x85, 0x87, 0x80, 0xf7, 0x73, 0xdd, 0x9d, 0x4d, 0xe5, 0x14, 0xcb, 0x95, 0x24, 0xc9, 0xa3, - 0x05, 0x46, 0xf8, 0x37, 0x66, 0x24, 0xba, 0x8e, 0x91, 0xd8, 0x06, 0x8c, 0xc4, 0xb7, 0xc2, 0xc8, - 0xef, 0x1c, 0xc8, 0x84, 0xa1, 0xef, 0xe0, 0xcb, 0xa8, 0x0c, 0x12, 0x43, 0x0b, 0x76, 0xd1, 0xf3, - 0x55, 0x9f, 0x8a, 0xfe, 0x97, 0xf0, 0xb8, 0xa4, 0x3e, 0x85, 0x56, 0xff, 0x0a, 0xd6, 0x29, 0xd6, - 0x4d, 0xc9, 0x8d, 0x74, 0x93, 0xf9, 0x18, 0xa4, 0x59, 0xc3, 0xaa, 0xb7, 0x9c, 0x4b, 0x5b, 0xc8, - 0x81, 0xf8, 0x90, 0x0c, 0x44, 0x8e, 0xf2, 0xcf, 0x0c, 0xe5, 0x02, 0xdc, 0x0f, 0x2e, 0x9e, 0x01, - 0xdf, 0x22, 0x67, 0x7f, 0x6d, 0x3e, 0xbc, 0xf6, 0xb7, 0x60, 0xc7, 0xfd, 0x88, 0x11, 0xf2, 0x00, - 0x20, 0x4f, 0x69, 0x16, 0x5b, 0x54, 0x0f, 0xcd, 0x10, 0x7d, 0x74, 0x61, 0xcb, 0x19, 0x59, 0xd0, - 0xaf, 0x18, 0xcf, 0x66, 0xd9, 0x7c, 0xfe, 0x0b, 0x07, 0xe2, 0xec, 0x25, 0x79, 0x0c, 0xe4, 0xb3, - 0xc6, 0x69, 0xa3, 0xda, 0x3c, 0xaf, 0x69, 0x35, 0xad, 0xa1, 0x9d, 0x7e, 0xa7, 0x5d, 0x54, 0x9f, - 0x34, 0xcf, 0x6b, 0x67, 0xf5, 0x6a, 0x45, 0xfb, 0x5a, 0xab, 0x3e, 0xc9, 0x46, 0xa4, 0x07, 0xd7, + // 1077 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x8f, 0x22, 0x45, + 0x14, 0xa7, 0x9b, 0x3f, 0x03, 0x05, 0xb3, 0xcb, 0xb6, 0xcc, 0x4c, 0xdb, 0xba, 0x34, 0xb6, 0x1a, + 0x27, 0x26, 0xdb, 0xc8, 0x8c, 0xf1, 0x30, 0xc6, 0xc3, 0xc0, 0x62, 0xec, 0xe8, 0xb2, 0xa4, 0x87, + 0x31, 0x71, 0x2e, 0x04, 0x9a, 0x82, 0xa9, 0x30, 0x74, 0x91, 0xee, 0x86, 0x2c, 0xdf, 0x60, 0x33, + 0x17, 0xbd, 0x78, 0xf0, 0x30, 0xc9, 0x26, 0x7e, 0x11, 0x8f, 0x1b, 0x4f, 0xeb, 0xcd, 0x13, 0x31, + 0x33, 0x17, 0xbd, 0xf2, 0x09, 0x4c, 0x55, 0xf5, 0x3f, 0xfe, 0xc5, 0xec, 0x82, 0xd9, 0x13, 0xf5, + 0xea, 0xfd, 0x5e, 0x55, 0xbd, 0x5f, 0xfd, 0xde, 0xab, 0x06, 0x7c, 0x82, 0xda, 0x46, 0xd1, 0xc0, + 0x16, 0x2c, 0x1a, 0xd8, 0x34, 0xa1, 0xe1, 0x20, 0x6c, 0x16, 0xc7, 0xa5, 0x90, 0xa5, 0x0e, 0x2d, + 0xec, 0x60, 0x61, 0x1f, 0xb5, 0x0d, 0x95, 0x00, 0xd5, 0x90, 0x6b, 0x5c, 0x92, 0x72, 0x3d, 0xdc, + 0xc3, 0x14, 0x52, 0x24, 0x23, 0x86, 0x96, 0xde, 0xed, 0x61, 0xdc, 0xbb, 0x82, 0x45, 0x6a, 0xb5, + 0x47, 0xdd, 0x62, 0xcb, 0x9c, 0xb8, 0xae, 0xf0, 0x8e, 0x83, 0x01, 0x72, 0x06, 0xd0, 0x74, 0xd8, + 0x8e, 0x9e, 0xe5, 0x02, 0xe5, 0x00, 0x78, 0x85, 0x3c, 0x10, 0x1d, 0x31, 0x80, 0xf2, 0x33, 0x0f, + 0xf6, 0x9e, 0xd8, 0xbd, 0x8a, 0x7f, 0x9e, 0xa7, 0x43, 0x68, 0x6a, 0x26, 0x72, 0x84, 0x12, 0x48, + 0x31, 0x64, 0x13, 0x75, 0x44, 0xae, 0xc0, 0x1d, 0xa6, 0xca, 0xb9, 0xd9, 0x54, 0xce, 0x4e, 0x5a, + 0x83, 0xab, 0x13, 0xc5, 0x77, 0x29, 0x7a, 0x92, 0x8d, 0xb5, 0x8e, 0xf0, 0x15, 0xd8, 0x0d, 0x12, + 0x23, 0x61, 0x3c, 0x0d, 0x13, 0x67, 0x53, 0x39, 0xe7, 0x86, 0x85, 0xdd, 0x8a, 0x9e, 0x09, 0x6c, + 0xad, 0x23, 0xd4, 0x40, 0xc6, 0xc0, 0x23, 0xd3, 0x81, 0xd6, 0xb0, 0x65, 0x39, 0x13, 0x31, 0x5a, + 0xe0, 0x0e, 0xd3, 0x47, 0x1f, 0xa9, 0xab, 0x59, 0x53, 0x2b, 0x21, 0x6c, 0x39, 0xf6, 0x72, 0x2a, + 0x47, 0xf4, 0xb9, 0x78, 0x41, 0x04, 0x3b, 0x63, 0x68, 0xd9, 0x08, 0x9b, 0x62, 0x8c, 0x1c, 0x44, + 0xf7, 0x4c, 0x61, 0x1f, 0x24, 0x6c, 0xd4, 0x33, 0xa1, 0x25, 0xc6, 0xa9, 0xc3, 0xb5, 0x4e, 0x92, + 0xcf, 0x5f, 0xc8, 0x91, 0xbf, 0x5f, 0xc8, 0x11, 0xe5, 0x8f, 0x04, 0xc8, 0x2d, 0xf1, 0xd2, 0xb0, + 0x26, 0x6f, 0x81, 0x96, 0x12, 0x48, 0x0d, 0x2d, 0x3c, 0x86, 0x1d, 0x12, 0x1a, 0x5d, 0xdc, 0xd1, + 0x77, 0x29, 0x7a, 0x92, 0x8d, 0xb5, 0x8e, 0x50, 0x07, 0x19, 0xf7, 0x24, 0xb6, 0xd3, 0x72, 0x20, + 0x4d, 0x3f, 0x7d, 0x94, 0x53, 0x99, 0xa2, 0x54, 0x4f, 0x51, 0xea, 0xa9, 0x39, 0x29, 0x1f, 0xcc, + 0xa6, 0xf2, 0x3b, 0x73, 0xa7, 0xa7, 0x31, 0x8a, 0x9e, 0x66, 0xe6, 0x19, 0xb1, 0x96, 0xee, 0x26, + 0xbe, 0xe1, 0xdd, 0x9c, 0x83, 0xbd, 0xb0, 0xdd, 0x74, 0x6f, 0xc6, 0x16, 0x13, 0x85, 0xe8, 0x61, + 0xaa, 0x5c, 0x98, 0x4d, 0xe5, 0xf7, 0x3d, 0x6e, 0x56, 0xc0, 0x14, 0x3d, 0x17, 0x9e, 0xff, 0xde, + 0x9d, 0x16, 0x2e, 0x40, 0x66, 0x68, 0x61, 0xdc, 0x6d, 0x5e, 0x42, 0xd4, 0xbb, 0x74, 0xc4, 0x1d, + 0x7a, 0x4c, 0x29, 0x74, 0x4c, 0x26, 0xfe, 0x71, 0x49, 0xfd, 0x86, 0x22, 0xca, 0xef, 0x91, 0xc3, + 0x05, 0x14, 0x84, 0xa3, 0x15, 0x3d, 0x4d, 0x4d, 0x86, 0x14, 0x3e, 0x07, 0x80, 0x79, 0x91, 0x89, + 0x1c, 0x31, 0x59, 0xe0, 0x0e, 0x33, 0xe5, 0xbd, 0xd9, 0x54, 0x7e, 0x10, 0x8e, 0x24, 0x3e, 0x45, + 0x4f, 0x51, 0x83, 0x96, 0xd1, 0x89, 0x77, 0x22, 0xb6, 0xb3, 0x98, 0xa2, 0x71, 0x07, 0x8b, 0x3b, + 0x32, 0xaf, 0xb7, 0x63, 0x85, 0x5a, 0x42, 0x05, 0xdc, 0x77, 0xbd, 0xd8, 0xb4, 0xa1, 0x69, 0x8f, + 0x6c, 0x11, 0xd0, 0x70, 0x69, 0x36, 0x95, 0xf7, 0xe7, 0xc2, 0x3d, 0x80, 0xa2, 0xdf, 0x63, 0x2b, + 0x78, 0x13, 0x42, 0x17, 0x64, 0x7d, 0xaf, 0x47, 0x4b, 0xfa, 0x3f, 0x69, 0x91, 0x5d, 0x5a, 0x0e, + 0x7c, 0x81, 0xce, 0xad, 0xa0, 0xe8, 0xf7, 0xfd, 0x29, 0x97, 0x9e, 0xa0, 0xa6, 0x32, 0x6b, 0x6a, + 0xea, 0xb7, 0xf8, 0x8a, 0x9a, 0x3a, 0x35, 0xfa, 0xcb, 0x05, 0xc2, 0xbd, 0x56, 0x81, 0x18, 0x40, + 0x9a, 0x13, 0xc9, 0xaa, 0x62, 0xfb, 0x78, 0x36, 0x95, 0x3f, 0x58, 0x21, 0xa8, 0x85, 0x85, 0xc5, + 0xb0, 0xb3, 0x12, 0xde, 0x24, 0xd4, 0x4c, 0xa2, 0xf3, 0xcd, 0x64, 0xfb, 0xc5, 0xb6, 0xa8, 0xe2, + 0xf8, 0x16, 0x55, 0xcc, 0xba, 0x09, 0xee, 0x36, 0x1d, 0x6b, 0x22, 0x26, 0xa8, 0x9a, 0xe6, 0xbb, + 0x09, 0x73, 0xb1, 0x6e, 0x82, 0xbb, 0xa4, 0xe5, 0x2d, 0x4a, 0x78, 0x67, 0x33, 0x09, 0x27, 0xb7, + 0x22, 0xe1, 0xd4, 0xff, 0x2a, 0x61, 0xb0, 0x46, 0xc2, 0xd7, 0x3c, 0x10, 0x97, 0x24, 0x5c, 0xc1, + 0x66, 0x17, 0x59, 0x83, 0x4d, 0x65, 0xec, 0xdf, 0x4c, 0xcb, 0xe8, 0x53, 0xd5, 0xae, 0xb8, 0x99, + 0x96, 0xd1, 0xf7, 0x6e, 0x86, 0x14, 0xce, 0xa2, 0x50, 0xa2, 0x5b, 0x14, 0x4a, 0x40, 0x46, 0x6c, + 0x0d, 0x19, 0xff, 0x70, 0x60, 0x37, 0x60, 0xa2, 0x6a, 0x76, 0xde, 0xe4, 0x71, 0x94, 0x40, 0xd2, + 0xef, 0xfd, 0x3c, 0xe9, 0xfd, 0xba, 0x6f, 0x0b, 0xc7, 0x20, 0xce, 0x4a, 0x8a, 0xe4, 0x75, 0xef, + 0xe8, 0xe1, 0xba, 0xd7, 0x86, 0x56, 0x8d, 0xce, 0xb0, 0x4b, 0x2f, 0x55, 0x6c, 0xb3, 0x97, 0xea, + 0x24, 0x46, 0xf2, 0x55, 0x7e, 0xe4, 0x41, 0x4e, 0xeb, 0x40, 0xd3, 0x41, 0x5d, 0x04, 0x3b, 0x41, + 0xd6, 0xc2, 0x43, 0xc0, 0xfb, 0xb9, 0xee, 0xce, 0xa6, 0x72, 0x8a, 0xe5, 0x4a, 0x92, 0xe4, 0xd1, + 0x02, 0x23, 0xfc, 0x6b, 0x33, 0x12, 0x5d, 0xc7, 0x48, 0x6c, 0x03, 0x46, 0xe2, 0x5b, 0x61, 0xe4, + 0x77, 0x0e, 0x64, 0xc2, 0xd0, 0xb7, 0xf0, 0x65, 0x54, 0x06, 0x89, 0xa1, 0x05, 0xbb, 0xe8, 0xd9, + 0xaa, 0x4f, 0x45, 0xff, 0x4b, 0x78, 0x5c, 0x52, 0x9f, 0x40, 0xab, 0x7f, 0x05, 0xeb, 0x14, 0xeb, + 0xa6, 0xe4, 0x46, 0xba, 0xc9, 0x7c, 0x08, 0xd2, 0xac, 0x61, 0xd5, 0x5b, 0xce, 0xa5, 0x2d, 0xe4, + 0x40, 0x7c, 0x48, 0x06, 0x22, 0x47, 0xf9, 0x67, 0x86, 0x72, 0x01, 0xee, 0x07, 0x17, 0xcf, 0x80, + 0x6f, 0x90, 0xb3, 0xbf, 0x36, 0x1f, 0x5e, 0xfb, 0x5b, 0xb0, 0xe3, 0x7e, 0xc4, 0x08, 0x79, 0x00, + 0x90, 0xa7, 0x34, 0x8b, 0x2d, 0xaa, 0x87, 0x66, 0x88, 0x3e, 0xba, 0xb0, 0xe5, 0x8c, 0x2c, 0xe8, + 0x57, 0x8c, 0x67, 0xb3, 0x6c, 0x3e, 0xfd, 0x85, 0x03, 0x71, 0xf6, 0x92, 0x7c, 0x01, 0xe4, 0xb3, + 0xc6, 0x69, 0xa3, 0xda, 0x3c, 0xaf, 0x69, 0x35, 0xad, 0xa1, 0x9d, 0x7e, 0xa7, 0x5d, 0x54, 0x1f, + 0x37, 0xcf, 0x6b, 0x67, 0xf5, 0x6a, 0x45, 0xfb, 0x5a, 0xab, 0x3e, 0xce, 0x46, 0xa4, 0x07, 0xd7, 0x37, 0x85, 0xdd, 0x39, 0x80, 0x20, 0x02, 0xc0, 0xe2, 0xc8, 0x64, 0x96, 0x93, 0x92, 0xd7, 0x37, - 0x85, 0x18, 0x19, 0x0b, 0x79, 0xb0, 0xcb, 0x3c, 0x0d, 0xfd, 0x87, 0x67, 0xf5, 0x6a, 0x2d, 0xcb, + 0x85, 0x18, 0x19, 0x0b, 0x79, 0xb0, 0xcb, 0x3c, 0x0d, 0xfd, 0x87, 0xa7, 0xf5, 0x6a, 0x2d, 0xcb, 0x4b, 0xe9, 0xeb, 0x9b, 0xc2, 0x8e, 0x6b, 0x06, 0x91, 0xd4, 0x19, 0x65, 0x91, 0x64, 0x2c, 0xc5, - 0x5e, 0xfc, 0x9a, 0x8f, 0x94, 0xeb, 0xaf, 0x6e, 0xf3, 0xdc, 0xeb, 0xdb, 0x3c, 0xf7, 0xd7, 0x6d, - 0x9e, 0xfb, 0xe9, 0x2e, 0x1f, 0x79, 0x7d, 0x97, 0x8f, 0xfc, 0x79, 0x97, 0x8f, 0x5c, 0x3c, 0xee, - 0x21, 0xe7, 0x72, 0xd4, 0x26, 0x57, 0x57, 0x34, 0xb0, 0x3d, 0xc0, 0xb6, 0xfb, 0xf3, 0xc8, 0xee, - 0xf4, 0x8b, 0xcf, 0x8b, 0xe4, 0xaf, 0xcc, 0x17, 0xc7, 0x8f, 0x42, 0xff, 0xb1, 0x9c, 0xc9, 0x10, - 0xda, 0xed, 0x04, 0x7d, 0x61, 0x8f, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x23, 0x2c, 0x45, 0x4d, - 0x87, 0x0d, 0x00, 0x00, + 0x9e, 0xff, 0x9a, 0x8f, 0x94, 0xcf, 0x5f, 0xde, 0xe6, 0xb9, 0x57, 0xb7, 0x79, 0xee, 0xaf, 0xdb, + 0x3c, 0xf7, 0xd3, 0x5d, 0x3e, 0xf2, 0xea, 0x2e, 0x1f, 0xf9, 0xf3, 0x2e, 0x1f, 0xb9, 0xf8, 0xb2, + 0x87, 0x9c, 0xcb, 0x51, 0x9b, 0x5c, 0x5d, 0xd1, 0xc0, 0xf6, 0x00, 0xdb, 0xee, 0xcf, 0x23, 0xbb, + 0xd3, 0x2f, 0x3e, 0x2b, 0xfa, 0x7f, 0x65, 0x3e, 0x3b, 0x7e, 0x14, 0xfa, 0xa3, 0xe5, 0x4c, 0x86, + 0xd0, 0x6e, 0x27, 0xe8, 0x33, 0x7b, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x5c, 0x29, + 0x45, 0x8c, 0x0d, 0x00, 0x00, } func (m *MsgConnectionOpenInit) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/03-connection/types/connection_test.go b/x/ibc/core/03-connection/types/connection_test.go similarity index 94% rename from x/ibc/03-connection/types/connection_test.go rename to x/ibc/core/03-connection/types/connection_test.go index 07eb366eeb..6fe486c352 100644 --- a/x/ibc/03-connection/types/connection_test.go +++ b/x/ibc/core/03-connection/types/connection_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/03-connection/types/errors.go b/x/ibc/core/03-connection/types/errors.go similarity index 100% rename from x/ibc/03-connection/types/errors.go rename to x/ibc/core/03-connection/types/errors.go diff --git a/x/ibc/03-connection/types/events.go b/x/ibc/core/03-connection/types/events.go similarity index 92% rename from x/ibc/03-connection/types/events.go rename to x/ibc/core/03-connection/types/events.go index 00fbb4d7af..3cb5997bd1 100644 --- a/x/ibc/03-connection/types/events.go +++ b/x/ibc/core/03-connection/types/events.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // IBC connection events diff --git a/x/ibc/03-connection/types/expected_keepers.go b/x/ibc/core/03-connection/types/expected_keepers.go similarity index 92% rename from x/ibc/03-connection/types/expected_keepers.go rename to x/ibc/core/03-connection/types/expected_keepers.go index cb2357d95c..9fc9958671 100644 --- a/x/ibc/03-connection/types/expected_keepers.go +++ b/x/ibc/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/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // ClientKeeper expected account IBC client keeper diff --git a/x/ibc/03-connection/types/genesis.go b/x/ibc/core/03-connection/types/genesis.go similarity index 96% rename from x/ibc/03-connection/types/genesis.go rename to x/ibc/core/03-connection/types/genesis.go index 47a896d9e0..9b155a368b 100644 --- a/x/ibc/03-connection/types/genesis.go +++ b/x/ibc/core/03-connection/types/genesis.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // NewConnectionPaths creates a ConnectionPaths instance. diff --git a/x/ibc/03-connection/types/genesis.pb.go b/x/ibc/core/03-connection/types/genesis.pb.go similarity index 97% rename from x/ibc/03-connection/types/genesis.pb.go rename to x/ibc/core/03-connection/types/genesis.pb.go index ffcb062aba..ba8b3bcd5b 100644 --- a/x/ibc/03-connection/types/genesis.pb.go +++ b/x/ibc/core/03-connection/types/genesis.pb.go @@ -98,12 +98,12 @@ var fileDescriptor_1879d34bc6ac3cd7 = []byte{ 0x39, 0x27, 0x33, 0x35, 0xaf, 0x24, 0x1e, 0x21, 0x1c, 0x5f, 0x90, 0x58, 0x92, 0x51, 0x2c, 0xc1, 0x04, 0xb6, 0x42, 0x1d, 0x97, 0x15, 0x08, 0x83, 0x03, 0x40, 0xca, 0x9d, 0xd4, 0x40, 0xa6, 0x7f, 0xba, 0x27, 0x2f, 0x57, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0xc3, 0x54, 0xa5, 0x20, 0x51, 0x88, - 0x0c, 0xba, 0xf6, 0x80, 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, 0x32, 0x4b, + 0x0c, 0xba, 0xf6, 0xd0, 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, 0x4e, 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, 0xa0, 0x20, 0x35, 0x30, 0xd6, 0x45, 0x0a, - 0xd0, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x48, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, - 0xff, 0x8f, 0xfd, 0xde, 0x5b, 0xc8, 0x01, 0x00, 0x00, + 0x86, 0x52, 0xba, 0xc5, 0x29, 0xd9, 0xfa, 0x15, 0xfa, 0xf0, 0x20, 0x35, 0x30, 0xd6, 0x45, 0x0a, + 0xd5, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x70, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, + 0xff, 0xae, 0x12, 0xc8, 0x83, 0xcd, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/03-connection/types/genesis_test.go b/x/ibc/core/03-connection/types/genesis_test.go similarity index 92% rename from x/ibc/03-connection/types/genesis_test.go rename to x/ibc/core/03-connection/types/genesis_test.go index 6ed5feff7b..05f8a88988 100644 --- a/x/ibc/03-connection/types/genesis_test.go +++ b/x/ibc/core/03-connection/types/genesis_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/03-connection/types/keys.go b/x/ibc/core/03-connection/types/keys.go similarity index 100% rename from x/ibc/03-connection/types/keys.go rename to x/ibc/core/03-connection/types/keys.go diff --git a/x/ibc/03-connection/types/msgs.go b/x/ibc/core/03-connection/types/msgs.go similarity index 97% rename from x/ibc/03-connection/types/msgs.go rename to x/ibc/core/03-connection/types/msgs.go index 8956be25d4..8fab737b88 100644 --- a/x/ibc/03-connection/types/msgs.go +++ b/x/ibc/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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var _ sdk.Msg = &MsgConnectionOpenInit{} diff --git a/x/ibc/03-connection/types/msgs_test.go b/x/ibc/core/03-connection/types/msgs_test.go similarity index 98% rename from x/ibc/03-connection/types/msgs_test.go rename to x/ibc/core/03-connection/types/msgs_test.go index e1bed97aa9..922def0851 100644 --- a/x/ibc/03-connection/types/msgs_test.go +++ b/x/ibc/core/03-connection/types/msgs_test.go @@ -15,9 +15,9 @@ 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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" ) diff --git a/x/ibc/03-connection/types/query.go b/x/ibc/core/03-connection/types/query.go similarity index 90% rename from x/ibc/03-connection/types/query.go rename to x/ibc/core/03-connection/types/query.go index 0c0024887f..d13f7ff913 100644 --- a/x/ibc/03-connection/types/query.go +++ b/x/ibc/core/03-connection/types/query.go @@ -4,10 +4,10 @@ import ( "strings" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // NewQueryConnectionResponse creates a new QueryConnectionResponse instance diff --git a/x/ibc/03-connection/types/query.pb.go b/x/ibc/core/03-connection/types/query.pb.go similarity index 93% rename from x/ibc/03-connection/types/query.pb.go rename to x/ibc/core/03-connection/types/query.pb.go index b98af94a84..7db05b66bb 100644 --- a/x/ibc/03-connection/types/query.pb.go +++ b/x/ibc/core/03-connection/types/query.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" types1 "github.com/cosmos/cosmos-sdk/codec/types" query "github.com/cosmos/cosmos-sdk/types/query" - types "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + types "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" @@ -671,65 +671,65 @@ func init() { } var fileDescriptor_cd8d529f8c7cd06b = []byte{ - // 917 bytes of a gzipped FileDescriptorProto + // 921 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x41, 0x6f, 0x1b, 0x45, 0x14, 0xce, 0x38, 0x49, 0xd5, 0x3c, 0xa7, 0x05, 0x46, 0x69, 0xbb, 0x2c, 0xd4, 0x09, 0x5b, 0x42, - 0x53, 0xa0, 0x33, 0x75, 0xa2, 0x46, 0xa5, 0xd4, 0x08, 0x5c, 0x15, 0x9a, 0x4b, 0x15, 0x96, 0x1b, - 0x97, 0x68, 0x77, 0x3d, 0x59, 0xaf, 0x88, 0x77, 0x5c, 0xcf, 0xda, 0xc2, 0x2a, 0x3e, 0xc0, 0x99, - 0x03, 0x12, 0xe2, 0xc8, 0x1f, 0xe0, 0xca, 0x3f, 0x40, 0x42, 0xea, 0xb1, 0x12, 0x97, 0x8a, 0x43, - 0x85, 0x12, 0xae, 0x5c, 0xb8, 0x23, 0xa1, 0x9d, 0x19, 0x77, 0x67, 0xe3, 0xdd, 0xc6, 0x58, 0x48, - 0x39, 0x79, 0xe7, 0xcd, 0x7b, 0xf3, 0xbe, 0xf7, 0xbd, 0x37, 0xdf, 0x18, 0x9c, 0xc8, 0x0f, 0x68, - 0xc0, 0x7b, 0x8c, 0x06, 0x3c, 0x8e, 0x59, 0x90, 0x44, 0x3c, 0xa6, 0x83, 0x3a, 0x7d, 0xd8, 0x67, - 0xbd, 0x21, 0xe9, 0xf6, 0x78, 0xc2, 0xf1, 0xc5, 0xc8, 0x0f, 0x48, 0xea, 0x43, 0x32, 0x1f, 0x32, - 0xa8, 0xdb, 0x2b, 0x21, 0x0f, 0xb9, 0x74, 0xa1, 0xe9, 0x97, 0xf2, 0xb6, 0xdf, 0x0e, 0xb8, 0xe8, - 0x70, 0x41, 0x7d, 0x4f, 0x30, 0x75, 0x0c, 0x1d, 0xd4, 0x7d, 0x96, 0x78, 0x75, 0xda, 0xf5, 0xc2, - 0x28, 0xf6, 0x64, 0xb8, 0xf2, 0x5d, 0xcd, 0xb2, 0x1f, 0x44, 0x2c, 0x4e, 0xd2, 0xcc, 0xea, 0x4b, - 0x3b, 0x5c, 0x2d, 0x81, 0x67, 0x00, 0x51, 0x8e, 0xaf, 0x87, 0x9c, 0x87, 0x07, 0x8c, 0x7a, 0xdd, - 0x88, 0x7a, 0x71, 0xcc, 0x13, 0x99, 0x46, 0xe8, 0xdd, 0x57, 0xf5, 0xae, 0x5c, 0xf9, 0xfd, 0x7d, - 0xea, 0xc5, 0xba, 0x38, 0xa7, 0x01, 0x17, 0x3f, 0x4d, 0x41, 0xde, 0x7d, 0x7e, 0xa2, 0xcb, 0x1e, - 0xf6, 0x99, 0x48, 0xf0, 0x15, 0x38, 0x97, 0xa5, 0xd9, 0x8b, 0x5a, 0x16, 0x5a, 0x43, 0x1b, 0x4b, - 0xee, 0x72, 0x66, 0xdc, 0x69, 0x39, 0xbf, 0x23, 0xb8, 0x34, 0x11, 0x2f, 0xba, 0x3c, 0x16, 0x0c, - 0xdf, 0x03, 0xc8, 0x7c, 0x65, 0x74, 0x75, 0x73, 0x9d, 0x14, 0x93, 0x49, 0xb2, 0xf8, 0x7b, 0x71, - 0xcb, 0x35, 0x02, 0xf1, 0x0a, 0x2c, 0x76, 0x7b, 0x9c, 0xef, 0x5b, 0x95, 0x35, 0xb4, 0xb1, 0xec, - 0xaa, 0x05, 0xbe, 0x0c, 0x20, 0x3f, 0xf6, 0xba, 0x5e, 0xd2, 0xb6, 0xe6, 0x25, 0xb4, 0x25, 0x69, - 0xd9, 0xf5, 0x92, 0x36, 0xbe, 0x0b, 0xcb, 0x6a, 0xbb, 0xcd, 0xa2, 0xb0, 0x9d, 0x58, 0x0b, 0x32, - 0xbb, 0x6d, 0x64, 0x57, 0x34, 0x0f, 0xea, 0xe4, 0xbe, 0xf4, 0x68, 0x2e, 0x3c, 0x7e, 0xb6, 0x3a, - 0xe7, 0x56, 0x65, 0x94, 0x32, 0x39, 0xde, 0x44, 0x6d, 0x62, 0x4c, 0xce, 0xc7, 0x00, 0x59, 0x37, - 0x75, 0x6d, 0x6f, 0x11, 0xd5, 0x7a, 0x92, 0xb6, 0x9e, 0xa8, 0x09, 0xd2, 0xad, 0x27, 0xbb, 0x5e, - 0xc8, 0x74, 0xac, 0x6b, 0x44, 0x3a, 0x7f, 0x21, 0xb0, 0x26, 0x73, 0x68, 0x02, 0x1f, 0x40, 0x35, - 0xe3, 0x41, 0x58, 0x68, 0x6d, 0x7e, 0xa3, 0xba, 0xf9, 0x6e, 0x19, 0x83, 0x3b, 0x2d, 0x16, 0x27, - 0xd1, 0x7e, 0xc4, 0x5a, 0x46, 0x2f, 0xcc, 0x03, 0xf0, 0x27, 0x39, 0xd0, 0x15, 0x09, 0xfa, 0xea, - 0x89, 0xa0, 0x15, 0x18, 0x13, 0x35, 0xbe, 0x05, 0x67, 0x34, 0xaf, 0xf3, 0x53, 0xf2, 0xaa, 0xfd, - 0x9d, 0x3b, 0x70, 0x59, 0x95, 0x2b, 0xdd, 0x0a, 0x88, 0x7d, 0x0d, 0x96, 0xd4, 0x11, 0xd9, 0xc4, - 0x9d, 0x55, 0x86, 0x9d, 0x96, 0xf3, 0x2b, 0x82, 0x5a, 0x59, 0xb8, 0xe6, 0xec, 0x1a, 0xbc, 0x6c, - 0x4c, 0x6d, 0x3a, 0x1c, 0x8a, 0xb8, 0x25, 0xf7, 0xa5, 0xcc, 0x9e, 0x8e, 0x88, 0x38, 0xc5, 0xc1, - 0xf2, 0xe1, 0x8d, 0x63, 0x4d, 0x57, 0x05, 0x7d, 0x96, 0x78, 0xc9, 0x78, 0x4c, 0x70, 0xa3, 0xf0, - 0xfe, 0x35, 0xad, 0xbf, 0x9f, 0xad, 0xae, 0x0c, 0xbd, 0xce, 0xc1, 0x6d, 0x27, 0xb7, 0xed, 0x1c, - 0xbb, 0x99, 0x5f, 0x57, 0xc0, 0x79, 0x51, 0x12, 0xcd, 0x97, 0x07, 0x97, 0xa2, 0xe7, 0x83, 0xb3, - 0xa7, 0xa9, 0x17, 0xa9, 0x8b, 0x9e, 0xea, 0x6b, 0x45, 0xa5, 0x19, 0xb3, 0x66, 0x9c, 0x79, 0x21, - 0x2a, 0x32, 0x9f, 0x22, 0xcf, 0x3f, 0x23, 0x78, 0xf3, 0x38, 0x07, 0x69, 0xd5, 0xb1, 0xe8, 0x8b, - 0xff, 0x91, 0x6b, 0xbc, 0x0e, 0xe7, 0x07, 0xac, 0x27, 0xd2, 0xcd, 0xb8, 0xdf, 0xf1, 0x59, 0x4f, - 0x96, 0xba, 0xe0, 0x9e, 0xd3, 0xd6, 0x07, 0xd2, 0x68, 0xba, 0x19, 0xd7, 0x27, 0x73, 0xd3, 0xa8, - 0xff, 0x41, 0xb0, 0x7e, 0x02, 0x6a, 0xdd, 0xbc, 0x06, 0xa4, 0x43, 0xad, 0x76, 0x72, 0x4d, 0x5b, - 0x21, 0x4a, 0xf1, 0xc9, 0x58, 0xf1, 0xc9, 0x47, 0xf1, 0xd0, 0x3d, 0x1f, 0xe4, 0x8e, 0xc9, 0xdf, - 0xb5, 0x4a, 0xfe, 0xae, 0x65, 0x5d, 0x9b, 0x2f, 0xef, 0xda, 0xc2, 0x49, 0x5d, 0x5b, 0x9c, 0xa1, - 0x6b, 0x9b, 0xdf, 0x9e, 0x85, 0x45, 0x59, 0x3f, 0xfe, 0x09, 0x01, 0x64, 0x24, 0x60, 0x52, 0x26, - 0x7d, 0xc5, 0x2f, 0x98, 0x4d, 0xa7, 0xf6, 0x57, 0x7c, 0x3a, 0xef, 0x7f, 0xf3, 0xdb, 0x9f, 0xdf, - 0x57, 0x6e, 0xe2, 0x2d, 0xaa, 0xde, 0x5d, 0xe3, 0xc9, 0x55, 0x2f, 0xb8, 0xa1, 0xa6, 0xf4, 0x51, - 0x6e, 0x24, 0x46, 0xf8, 0x47, 0x04, 0x55, 0x43, 0x91, 0xf0, 0xb4, 0xd9, 0xc7, 0xd2, 0x67, 0xdf, - 0x98, 0x3e, 0x40, 0xe3, 0x7d, 0x47, 0xe2, 0x5d, 0xc7, 0x57, 0xa6, 0xc0, 0x8b, 0x7f, 0x41, 0xf0, - 0xca, 0x84, 0x6e, 0xe2, 0x9b, 0x2f, 0x4e, 0x5a, 0x22, 0xd3, 0xf6, 0xf6, 0x7f, 0x0d, 0xd3, 0x88, - 0x3f, 0x90, 0x88, 0x6f, 0xe1, 0xed, 0x52, 0xc4, 0x6a, 0x20, 0xf3, 0x44, 0x8f, 0x87, 0x74, 0x84, - 0x9f, 0x22, 0xb8, 0x50, 0x28, 0x68, 0xf8, 0xbd, 0x29, 0xd9, 0x9b, 0x54, 0x5a, 0xfb, 0xf6, 0x2c, - 0xa1, 0xba, 0xa0, 0xfb, 0xb2, 0xa0, 0x26, 0xfe, 0x70, 0x86, 0x91, 0xa1, 0xa6, 0xdc, 0xe2, 0x1f, - 0x2a, 0x60, 0x95, 0xdd, 0x78, 0x7c, 0x67, 0x5a, 0x88, 0x45, 0xf2, 0x66, 0x37, 0x66, 0x8c, 0xd6, - 0x35, 0x7e, 0x25, 0x6b, 0x1c, 0xe0, 0x64, 0xa6, 0x1a, 0xf3, 0x02, 0x45, 0xb5, 0xd6, 0xd1, 0x47, - 0x79, 0xc5, 0x1c, 0x51, 0x25, 0x19, 0x99, 0x5d, 0xad, 0x47, 0xcd, 0xdd, 0xc7, 0x87, 0x35, 0xf4, - 0xe4, 0xb0, 0x86, 0xfe, 0x38, 0xac, 0xa1, 0xef, 0x8e, 0x6a, 0x73, 0x4f, 0x8e, 0x6a, 0x73, 0x4f, - 0x8f, 0x6a, 0x73, 0x9f, 0x6f, 0x87, 0x51, 0xd2, 0xee, 0xfb, 0x24, 0xe0, 0x1d, 0xaa, 0xff, 0x75, - 0xab, 0x9f, 0xeb, 0xa2, 0xf5, 0x05, 0xfd, 0x52, 0xa2, 0xbd, 0xb1, 0x75, 0xdd, 0x00, 0x9c, 0x0c, - 0xbb, 0x4c, 0xf8, 0x67, 0xa4, 0x2a, 0x6e, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xea, 0x66, - 0xcb, 0xfd, 0x0b, 0x00, 0x00, + 0x53, 0xa0, 0x33, 0x75, 0xa2, 0x56, 0xa5, 0xad, 0x11, 0xb8, 0x2a, 0x34, 0x97, 0xaa, 0x2c, 0xe2, + 0xc2, 0x25, 0xda, 0x5d, 0x4f, 0xd6, 0x2b, 0xe2, 0x1d, 0xd7, 0xb3, 0xb6, 0xb0, 0x8a, 0x0f, 0x70, + 0xe6, 0x80, 0x84, 0x38, 0xf2, 0x07, 0xb8, 0xf2, 0x0f, 0x90, 0x90, 0x7a, 0xac, 0xc4, 0xa5, 0xe2, + 0x50, 0xa1, 0x84, 0x2b, 0x17, 0xee, 0x48, 0x68, 0x67, 0xc6, 0xd9, 0xd9, 0x78, 0xb7, 0x31, 0x16, + 0x52, 0x4e, 0xde, 0x79, 0xf3, 0xde, 0xbc, 0xef, 0x7d, 0xef, 0xcd, 0x37, 0x06, 0x27, 0xf2, 0x03, + 0x1a, 0xf0, 0x1e, 0xa3, 0x01, 0x8f, 0x63, 0x16, 0x24, 0x11, 0x8f, 0xe9, 0xa0, 0x4e, 0x1f, 0xf5, + 0x59, 0x6f, 0x48, 0xba, 0x3d, 0x9e, 0x70, 0x7c, 0x3e, 0xf2, 0x03, 0x92, 0xfa, 0x90, 0xcc, 0x87, + 0x0c, 0xea, 0xf6, 0x4a, 0xc8, 0x43, 0x2e, 0x5d, 0x68, 0xfa, 0xa5, 0xbc, 0xed, 0xb7, 0x03, 0x2e, + 0x3a, 0x5c, 0x50, 0xdf, 0x13, 0x4c, 0x1d, 0x43, 0x07, 0x75, 0x9f, 0x25, 0x5e, 0x9d, 0x76, 0xbd, + 0x30, 0x8a, 0x3d, 0x19, 0xae, 0x7c, 0x57, 0xb3, 0xec, 0x7b, 0x11, 0x8b, 0x93, 0x34, 0xb3, 0xfa, + 0xd2, 0x0e, 0x97, 0x4b, 0xe0, 0x19, 0x40, 0x94, 0xe3, 0xeb, 0x21, 0xe7, 0xe1, 0x1e, 0xa3, 0x5e, + 0x37, 0xa2, 0x5e, 0x1c, 0xf3, 0x44, 0xa6, 0x11, 0x7a, 0xf7, 0x55, 0xbd, 0x2b, 0x57, 0x7e, 0x7f, + 0x97, 0x7a, 0xb1, 0x2e, 0xce, 0x69, 0xc0, 0xf9, 0x4f, 0x52, 0x90, 0x77, 0x0f, 0x4f, 0x74, 0xd9, + 0xa3, 0x3e, 0x13, 0x09, 0xbe, 0x04, 0x67, 0xb2, 0x34, 0x3b, 0x51, 0xcb, 0x42, 0x6b, 0x68, 0x63, + 0xc9, 0x5d, 0xce, 0x8c, 0xdb, 0x2d, 0xe7, 0x77, 0x04, 0x17, 0x26, 0xe2, 0x45, 0x97, 0xc7, 0x82, + 0xe1, 0x7b, 0x00, 0x99, 0xaf, 0x8c, 0xae, 0x6e, 0xae, 0x93, 0x62, 0x32, 0x49, 0x16, 0x7f, 0x2f, + 0x6e, 0xb9, 0x46, 0x20, 0x5e, 0x81, 0xc5, 0x6e, 0x8f, 0xf3, 0x5d, 0xab, 0xb2, 0x86, 0x36, 0x96, + 0x5d, 0xb5, 0xc0, 0x17, 0x01, 0xe4, 0xc7, 0x4e, 0xd7, 0x4b, 0xda, 0xd6, 0xbc, 0x84, 0xb6, 0x24, + 0x2d, 0x0f, 0xbd, 0xa4, 0x8d, 0xef, 0xc2, 0xb2, 0xda, 0x6e, 0xb3, 0x28, 0x6c, 0x27, 0xd6, 0x82, + 0xcc, 0x6e, 0x1b, 0xd9, 0x15, 0xcd, 0x83, 0x3a, 0xb9, 0x2f, 0x3d, 0x9a, 0x0b, 0x4f, 0x9e, 0xaf, + 0xce, 0xb9, 0x55, 0x19, 0xa5, 0x4c, 0x8e, 0x37, 0x51, 0x9b, 0x18, 0x93, 0xf3, 0x11, 0x40, 0xd6, + 0x4d, 0x5d, 0xdb, 0x5b, 0x44, 0xb5, 0x9e, 0xa4, 0xad, 0x27, 0x6a, 0x82, 0x74, 0xeb, 0xc9, 0x43, + 0x2f, 0x64, 0x3a, 0xd6, 0x35, 0x22, 0x9d, 0xbf, 0x10, 0x58, 0x93, 0x39, 0x34, 0x81, 0x0f, 0xa0, + 0x9a, 0xf1, 0x20, 0x2c, 0xb4, 0x36, 0xbf, 0x51, 0xdd, 0x7c, 0xb7, 0x8c, 0xc1, 0xed, 0x16, 0x8b, + 0x93, 0x68, 0x37, 0x62, 0x2d, 0xa3, 0x17, 0xe6, 0x01, 0xf8, 0xe3, 0x1c, 0xe8, 0x8a, 0x04, 0x7d, + 0xf9, 0x58, 0xd0, 0x0a, 0x8c, 0x89, 0x1a, 0xdf, 0x84, 0x53, 0x9a, 0xd7, 0xf9, 0x29, 0x79, 0xd5, + 0xfe, 0xce, 0x1d, 0xb8, 0xa8, 0xca, 0x95, 0x6e, 0x05, 0xc4, 0xbe, 0x06, 0x4b, 0xea, 0x88, 0x6c, + 0xe2, 0x4e, 0x2b, 0xc3, 0x76, 0xcb, 0xf9, 0x15, 0x41, 0xad, 0x2c, 0x5c, 0x73, 0x76, 0x05, 0x5e, + 0x36, 0xa6, 0x36, 0x1d, 0x0e, 0x45, 0xdc, 0x92, 0xfb, 0x52, 0x66, 0x4f, 0x47, 0x44, 0x9c, 0xe0, + 0x60, 0xf9, 0xf0, 0xc6, 0x91, 0xa6, 0xab, 0x82, 0x3e, 0x4d, 0xbc, 0x64, 0x3c, 0x26, 0xb8, 0x51, + 0x78, 0xff, 0x9a, 0xd6, 0xdf, 0xcf, 0x57, 0x57, 0x86, 0x5e, 0x67, 0xef, 0x96, 0x93, 0xdb, 0x76, + 0x8e, 0xdc, 0xcc, 0xaf, 0x2b, 0xe0, 0xbc, 0x28, 0x89, 0xe6, 0xcb, 0x83, 0x0b, 0xd1, 0xe1, 0xe0, + 0xec, 0x68, 0xea, 0x45, 0xea, 0xa2, 0xa7, 0xfa, 0x4a, 0x51, 0x69, 0xc6, 0xac, 0x19, 0x67, 0x9e, + 0x8b, 0x8a, 0xcc, 0x27, 0xc8, 0xf3, 0xcf, 0x08, 0xde, 0x3c, 0xca, 0x41, 0x5a, 0x75, 0x2c, 0xfa, + 0xe2, 0x7f, 0xe4, 0x1a, 0xaf, 0xc3, 0xd9, 0x01, 0xeb, 0x89, 0x74, 0x33, 0xee, 0x77, 0x7c, 0xd6, + 0x93, 0xa5, 0x2e, 0xb8, 0x67, 0xb4, 0xf5, 0x81, 0x34, 0x9a, 0x6e, 0xc6, 0xf5, 0xc9, 0xdc, 0x34, + 0xea, 0x7f, 0x10, 0xac, 0x1f, 0x83, 0x5a, 0x37, 0xaf, 0x01, 0xe9, 0x50, 0xab, 0x9d, 0x5c, 0xd3, + 0x56, 0x88, 0x52, 0x7c, 0x32, 0x56, 0x7c, 0xf2, 0x61, 0x3c, 0x74, 0xcf, 0x06, 0xb9, 0x63, 0xf2, + 0x77, 0xad, 0x92, 0xbf, 0x6b, 0x59, 0xd7, 0xe6, 0xcb, 0xbb, 0xb6, 0x70, 0x5c, 0xd7, 0x16, 0x67, + 0xe8, 0xda, 0xe6, 0xb7, 0xa7, 0x61, 0x51, 0xd6, 0x8f, 0x7f, 0x42, 0x00, 0x19, 0x09, 0x98, 0x94, + 0x49, 0x5f, 0xf1, 0x0b, 0x66, 0xd3, 0xa9, 0xfd, 0x15, 0x9f, 0xce, 0xed, 0x6f, 0x7e, 0xfb, 0xf3, + 0xfb, 0xca, 0x75, 0xbc, 0x45, 0xd5, 0xbb, 0x6b, 0x3c, 0xb9, 0xea, 0x05, 0x37, 0xd4, 0x94, 0x3e, + 0xce, 0x8d, 0xc4, 0x08, 0xff, 0x88, 0xa0, 0x6a, 0x28, 0x12, 0x9e, 0x36, 0xfb, 0x58, 0xfa, 0xec, + 0x6b, 0xd3, 0x07, 0x68, 0xbc, 0xef, 0x48, 0xbc, 0xeb, 0xf8, 0xd2, 0x14, 0x78, 0xf1, 0x2f, 0x08, + 0x5e, 0x99, 0xd0, 0x4d, 0x7c, 0xfd, 0xc5, 0x49, 0x4b, 0x64, 0xda, 0xbe, 0xf1, 0x5f, 0xc3, 0x34, + 0xe2, 0xf7, 0x25, 0xe2, 0x9b, 0xf8, 0x46, 0x29, 0x62, 0x35, 0x90, 0x79, 0xa2, 0xc7, 0x43, 0x3a, + 0xc2, 0xcf, 0x10, 0x9c, 0x2b, 0x14, 0x34, 0xfc, 0xde, 0x94, 0xec, 0x4d, 0x2a, 0xad, 0x7d, 0x6b, + 0x96, 0x50, 0x5d, 0xd0, 0x7d, 0x59, 0x50, 0x13, 0x7f, 0x30, 0xc3, 0xc8, 0x50, 0x53, 0x6e, 0xf1, + 0x0f, 0x15, 0xb0, 0xca, 0x6e, 0x3c, 0xbe, 0x33, 0x2d, 0xc4, 0x22, 0x79, 0xb3, 0x1b, 0x33, 0x46, + 0xeb, 0x1a, 0xbf, 0x92, 0x35, 0x0e, 0x70, 0x32, 0x53, 0x8d, 0x79, 0x81, 0xa2, 0x5a, 0xeb, 0xe8, + 0xe3, 0xbc, 0x62, 0x8e, 0xa8, 0x92, 0x8c, 0xcc, 0xae, 0xd6, 0xa3, 0xe6, 0x67, 0x4f, 0xf6, 0x6b, + 0xe8, 0xe9, 0x7e, 0x0d, 0xfd, 0xb1, 0x5f, 0x43, 0xdf, 0x1d, 0xd4, 0xe6, 0x9e, 0x1e, 0xd4, 0xe6, + 0x9e, 0x1d, 0xd4, 0xe6, 0x3e, 0xbf, 0x1d, 0x46, 0x49, 0xbb, 0xef, 0x93, 0x80, 0x77, 0xa8, 0xfe, + 0xd7, 0xad, 0x7e, 0xae, 0x8a, 0xd6, 0x17, 0xf4, 0x4b, 0x7a, 0xf8, 0xe7, 0xf9, 0xda, 0xd6, 0x55, + 0x03, 0x75, 0x32, 0xec, 0x32, 0xe1, 0x9f, 0x92, 0xd2, 0xb8, 0xf5, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xa3, 0x81, 0x7f, 0x88, 0x02, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/03-connection/types/query.pb.gw.go b/x/ibc/core/03-connection/types/query.pb.gw.go similarity index 100% rename from x/ibc/03-connection/types/query.pb.gw.go rename to x/ibc/core/03-connection/types/query.pb.gw.go diff --git a/x/ibc/03-connection/types/version.go b/x/ibc/core/03-connection/types/version.go similarity index 100% rename from x/ibc/03-connection/types/version.go rename to x/ibc/core/03-connection/types/version.go diff --git a/x/ibc/03-connection/types/version_test.go b/x/ibc/core/03-connection/types/version_test.go similarity index 99% rename from x/ibc/03-connection/types/version_test.go rename to x/ibc/core/03-connection/types/version_test.go index ed15354fbe..a18c87dde3 100644 --- a/x/ibc/03-connection/types/version_test.go +++ b/x/ibc/core/03-connection/types/version_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/04-channel/client/cli/cli.go b/x/ibc/core/04-channel/client/cli/cli.go similarity index 95% rename from x/ibc/04-channel/client/cli/cli.go rename to x/ibc/core/04-channel/client/cli/cli.go index 5b885058a0..5eb4d81ae4 100644 --- a/x/ibc/04-channel/client/cli/cli.go +++ b/x/ibc/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/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) // GetQueryCmd returns the query commands for IBC channels diff --git a/x/ibc/04-channel/client/cli/query.go b/x/ibc/core/04-channel/client/cli/query.go similarity index 98% rename from x/ibc/04-channel/client/cli/query.go rename to x/ibc/core/04-channel/client/cli/query.go index eede564208..0f2f95dbc5 100644 --- a/x/ibc/04-channel/client/cli/query.go +++ b/x/ibc/core/04-channel/client/cli/query.go @@ -10,9 +10,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/04-channel/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ) const ( diff --git a/x/ibc/04-channel/client/cli/tx.go b/x/ibc/core/04-channel/client/cli/tx.go similarity index 97% rename from x/ibc/04-channel/client/cli/tx.go rename to x/ibc/core/04-channel/client/cli/tx.go index 10d4990f71..e769ef4c7a 100644 --- a/x/ibc/04-channel/client/cli/tx.go +++ b/x/ibc/core/04-channel/client/cli/tx.go @@ -9,10 +9,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectionutils "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/client/utils" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" 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" ) // IBC Channel flags diff --git a/x/ibc/04-channel/client/utils/utils.go b/x/ibc/core/04-channel/client/utils/utils.go similarity index 95% rename from x/ibc/04-channel/client/utils/utils.go rename to x/ibc/core/04-channel/client/utils/utils.go index 734dc33470..725c346c6c 100644 --- a/x/ibc/04-channel/client/utils/utils.go +++ b/x/ibc/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/02-client/client/utils" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/client" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // QueryPacketCommitment returns a packet commitment. diff --git a/x/ibc/04-channel/genesis.go b/x/ibc/core/04-channel/genesis.go similarity index 92% rename from x/ibc/04-channel/genesis.go rename to x/ibc/core/04-channel/genesis.go index 9256c1bf46..24034f171e 100644 --- a/x/ibc/04-channel/genesis.go +++ b/x/ibc/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/04-channel/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/keeper" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) // InitGenesis initializes the ibc channel submodule's state from a provided genesis diff --git a/x/ibc/04-channel/handler.go b/x/ibc/core/04-channel/handler.go similarity index 98% rename from x/ibc/04-channel/handler.go rename to x/ibc/core/04-channel/handler.go index 17b1735567..052b0cd035 100644 --- a/x/ibc/04-channel/handler.go +++ b/x/ibc/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/04-channel/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/keeper" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) // HandleMsgChannelOpenInit defines the sdk.Handler for MsgChannelOpenInit diff --git a/x/ibc/04-channel/keeper/grpc_query.go b/x/ibc/core/04-channel/keeper/grpc_query.go similarity index 98% rename from x/ibc/04-channel/keeper/grpc_query.go rename to x/ibc/core/04-channel/keeper/grpc_query.go index e62af86be1..bbbd0f68eb 100644 --- a/x/ibc/04-channel/keeper/grpc_query.go +++ b/x/ibc/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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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" ) var _ types.QueryServer = (*Keeper)(nil) diff --git a/x/ibc/04-channel/keeper/grpc_query_test.go b/x/ibc/core/04-channel/keeper/grpc_query_test.go similarity index 99% rename from x/ibc/04-channel/keeper/grpc_query_test.go rename to x/ibc/core/04-channel/keeper/grpc_query_test.go index 333a31a188..28690a32cf 100644 --- a/x/ibc/04-channel/keeper/grpc_query_test.go +++ b/x/ibc/core/04-channel/keeper/grpc_query_test.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/04-channel/keeper/handshake.go b/x/ibc/core/04-channel/keeper/handshake.go similarity index 97% rename from x/ibc/04-channel/keeper/handshake.go rename to x/ibc/core/04-channel/keeper/handshake.go index 312f88bdd9..dfa023713b 100644 --- a/x/ibc/04-channel/keeper/handshake.go +++ b/x/ibc/core/04-channel/keeper/handshake.go @@ -6,11 +6,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/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // CounterpartyHops returns the connection hops of the counterparty channel. diff --git a/x/ibc/04-channel/keeper/handshake_test.go b/x/ibc/core/04-channel/keeper/handshake_test.go similarity index 98% rename from x/ibc/04-channel/keeper/handshake_test.go rename to x/ibc/core/04-channel/keeper/handshake_test.go index 3999a3315f..a20b83de15 100644 --- a/x/ibc/04-channel/keeper/handshake_test.go +++ b/x/ibc/core/04-channel/keeper/handshake_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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/04-channel/keeper/keeper.go b/x/ibc/core/04-channel/keeper/keeper.go similarity index 98% rename from x/ibc/04-channel/keeper/keeper.go rename to x/ibc/core/04-channel/keeper/keeper.go index 950e396ad6..e87f567361 100644 --- a/x/ibc/04-channel/keeper/keeper.go +++ b/x/ibc/core/04-channel/keeper/keeper.go @@ -12,9 +12,9 @@ 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/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ) // Keeper defines the IBC channel keeper diff --git a/x/ibc/04-channel/keeper/keeper_test.go b/x/ibc/core/04-channel/keeper/keeper_test.go similarity index 99% rename from x/ibc/04-channel/keeper/keeper_test.go rename to x/ibc/core/04-channel/keeper/keeper_test.go index f8b56771be..d69ec96dcd 100644 --- a/x/ibc/04-channel/keeper/keeper_test.go +++ b/x/ibc/core/04-channel/keeper/keeper_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/04-channel/keeper/packet.go b/x/ibc/core/04-channel/keeper/packet.go similarity index 98% rename from x/ibc/04-channel/keeper/packet.go rename to x/ibc/core/04-channel/keeper/packet.go index 42abff7259..444b3d6f67 100644 --- a/x/ibc/04-channel/keeper/packet.go +++ b/x/ibc/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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // SendPacket is called by a module in order to send an IBC packet on a channel diff --git a/x/ibc/04-channel/keeper/packet_test.go b/x/ibc/core/04-channel/keeper/packet_test.go similarity index 99% rename from x/ibc/04-channel/keeper/packet_test.go rename to x/ibc/core/04-channel/keeper/packet_test.go index f0fa67e4b8..e2cc85459f 100644 --- a/x/ibc/04-channel/keeper/packet_test.go +++ b/x/ibc/core/04-channel/keeper/packet_test.go @@ -4,10 +4,10 @@ import ( "fmt" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/04-channel/keeper/timeout.go b/x/ibc/core/04-channel/keeper/timeout.go similarity index 97% rename from x/ibc/04-channel/keeper/timeout.go rename to x/ibc/core/04-channel/keeper/timeout.go index d35de53e2e..3c7f9783c9 100644 --- a/x/ibc/04-channel/keeper/timeout.go +++ b/x/ibc/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/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // TimeoutPacket is called by a module which originally attempted to send a diff --git a/x/ibc/04-channel/keeper/timeout_test.go b/x/ibc/core/04-channel/keeper/timeout_test.go similarity index 98% rename from x/ibc/04-channel/keeper/timeout_test.go rename to x/ibc/core/04-channel/keeper/timeout_test.go index 655aded4a6..774f9eacf1 100644 --- a/x/ibc/04-channel/keeper/timeout_test.go +++ b/x/ibc/core/04-channel/keeper/timeout_test.go @@ -4,10 +4,10 @@ import ( "fmt" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/04-channel/module.go b/x/ibc/core/04-channel/module.go similarity index 83% rename from x/ibc/04-channel/module.go rename to x/ibc/core/04-channel/module.go index 9f5c1584d6..569120ad92 100644 --- a/x/ibc/04-channel/module.go +++ b/x/ibc/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/04-channel/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/client/cli" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) // Name returns the IBC channel ICS name. diff --git a/x/ibc/04-channel/simulation/decoder.go b/x/ibc/core/04-channel/simulation/decoder.go similarity index 93% rename from x/ibc/04-channel/simulation/decoder.go rename to x/ibc/core/04-channel/simulation/decoder.go index a254256ab3..006bc08e93 100644 --- a/x/ibc/04-channel/simulation/decoder.go +++ b/x/ibc/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/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/ibc/04-channel/simulation/decoder_test.go b/x/ibc/core/04-channel/simulation/decoder_test.go similarity index 92% rename from x/ibc/04-channel/simulation/decoder_test.go rename to x/ibc/core/04-channel/simulation/decoder_test.go index d511273b8b..2d61a8f9a4 100644 --- a/x/ibc/04-channel/simulation/decoder_test.go +++ b/x/ibc/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/04-channel/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "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" ) func TestDecodeStore(t *testing.T) { diff --git a/x/ibc/04-channel/simulation/genesis.go b/x/ibc/core/04-channel/simulation/genesis.go similarity index 82% rename from x/ibc/04-channel/simulation/genesis.go rename to x/ibc/core/04-channel/simulation/genesis.go index 42808ed39d..ed33902191 100644 --- a/x/ibc/04-channel/simulation/genesis.go +++ b/x/ibc/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/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) // GenChannelGenesis returns the default channel genesis state. diff --git a/x/ibc/04-channel/types/channel.go b/x/ibc/core/04-channel/types/channel.go similarity index 97% rename from x/ibc/04-channel/types/channel.go rename to x/ibc/core/04-channel/types/channel.go index f1e8d91f60..1eebcaef43 100644 --- a/x/ibc/04-channel/types/channel.go +++ b/x/ibc/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/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) var ( diff --git a/x/ibc/04-channel/types/channel.pb.go b/x/ibc/core/04-channel/types/channel.pb.go similarity index 94% rename from x/ibc/04-channel/types/channel.pb.go rename to x/ibc/core/04-channel/types/channel.pb.go index e7582b0b8a..82f32f70c5 100644 --- a/x/ibc/04-channel/types/channel.pb.go +++ b/x/ibc/core/04-channel/types/channel.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + types "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" @@ -889,94 +889,94 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/channel.proto", fileDescriptor_c3a07336710636a0) } var fileDescriptor_c3a07336710636a0 = []byte{ - // 1383 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4f, 0x6b, 0x1b, 0x47, - 0x14, 0xd7, 0xea, 0xbf, 0x9f, 0x65, 0x5b, 0x1e, 0xdb, 0xca, 0x46, 0x4e, 0xb4, 0xca, 0xd2, 0x83, - 0x49, 0x89, 0x14, 0x27, 0xa1, 0xa5, 0xa1, 0x87, 0x5a, 0xb2, 0x82, 0x45, 0x62, 0xc9, 0x8c, 0x95, - 0x42, 0x73, 0x51, 0xd7, 0xab, 0x89, 0xb4, 0xc8, 0xda, 0x51, 0x77, 0xd7, 0x4e, 0xfc, 0x0d, 0x82, - 0xa1, 0xd0, 0x73, 0xc1, 0x10, 0x28, 0x85, 0x42, 0xa1, 0x3d, 0xf6, 0xd2, 0x0f, 0x90, 0x63, 0x6e, - 0xed, 0x69, 0x29, 0xc9, 0xa1, 0x39, 0xeb, 0xda, 0x43, 0xcb, 0xce, 0xcc, 0x5a, 0x2b, 0xc5, 0x4a, - 0x4b, 0x53, 0x8b, 0x16, 0x7a, 0xd2, 0xbc, 0xf7, 0x7e, 0x33, 0xf3, 0xde, 0xef, 0xbd, 0x79, 0x33, - 0x2b, 0xb8, 0x62, 0xec, 0xe9, 0x45, 0x9d, 0x5a, 0xa4, 0xa8, 0x77, 0x34, 0xd3, 0x24, 0xfb, 0xc5, - 0xc3, 0x75, 0x7f, 0x58, 0xe8, 0x5b, 0xd4, 0xa1, 0x68, 0xc9, 0xd8, 0xd3, 0x0b, 0x1e, 0xa4, 0xe0, - 0xeb, 0x0f, 0xd7, 0xb3, 0xcb, 0x6d, 0xda, 0xa6, 0xcc, 0x5e, 0xf4, 0x46, 0x1c, 0x9a, 0x55, 0x86, - 0xab, 0xed, 0x1b, 0xc4, 0x74, 0xd8, 0x62, 0x6c, 0xc4, 0x01, 0xea, 0x4f, 0x12, 0xa0, 0x6d, 0xbb, - 0x5d, 0xe6, 0x0b, 0xd5, 0xfb, 0xc4, 0xac, 0x9a, 0x86, 0x83, 0xde, 0x85, 0x44, 0x9f, 0x5a, 0x4e, - 0xd3, 0x68, 0xc9, 0x52, 0x5e, 0x5a, 0x9b, 0x29, 0xa1, 0x81, 0xab, 0xcc, 0x1f, 0x69, 0xbd, 0xfd, - 0xdb, 0xaa, 0x30, 0xa8, 0x38, 0xee, 0x8d, 0xaa, 0x2d, 0x74, 0x0b, 0x40, 0x38, 0xe2, 0xe1, 0xc3, - 0x0c, 0xbf, 0x32, 0x70, 0x95, 0x45, 0x8e, 0x1f, 0xda, 0x54, 0x3c, 0x23, 0x84, 0x6a, 0x0b, 0x7d, - 0x08, 0x09, 0x21, 0xc8, 0x91, 0xbc, 0xb4, 0x36, 0x7b, 0xe3, 0x52, 0xe1, 0x8c, 0xb8, 0x0a, 0xc2, - 0xb3, 0x52, 0xf4, 0x99, 0xab, 0x84, 0xb0, 0x3f, 0x05, 0x65, 0x20, 0x6e, 0x1b, 0x6d, 0x93, 0x58, - 0x72, 0xd4, 0xdb, 0x0f, 0x0b, 0xe9, 0x76, 0xf2, 0xc9, 0x53, 0x25, 0xf4, 0xea, 0xa9, 0x12, 0x52, - 0x7f, 0x8c, 0xc0, 0xe2, 0x68, 0x64, 0x0d, 0xeb, 0xe8, 0xdf, 0x1f, 0x18, 0x86, 0x65, 0x9d, 0x1e, - 0x98, 0x0e, 0xb1, 0xfa, 0x9a, 0xe5, 0x1c, 0x35, 0x0f, 0x89, 0x65, 0x1b, 0xd4, 0xe4, 0x61, 0x96, - 0x94, 0x81, 0xab, 0xac, 0x8a, 0xdd, 0xcf, 0x40, 0xa9, 0x78, 0x29, 0xa8, 0xfe, 0x98, 0x6b, 0xbd, - 0x38, 0xfa, 0x16, 0xa5, 0x0f, 0x9b, 0x86, 0x69, 0x38, 0x72, 0x2c, 0x2f, 0xad, 0xa5, 0x82, 0x71, - 0x0c, 0x6d, 0x2a, 0x9e, 0x61, 0x02, 0xab, 0x81, 0x07, 0x90, 0xe2, 0x96, 0x0e, 0x31, 0xda, 0x1d, - 0x47, 0x8e, 0xb3, 0x60, 0xb2, 0x81, 0x60, 0x78, 0x21, 0x1d, 0xae, 0x17, 0xb6, 0x18, 0xa2, 0xb4, - 0xea, 0x85, 0x32, 0x70, 0x95, 0xa5, 0xe0, 0xba, 0x7c, 0xb6, 0x8a, 0x67, 0x99, 0xc8, 0x91, 0x81, - 0xf4, 0x25, 0x26, 0xa4, 0xef, 0xb7, 0xf0, 0x78, 0xfa, 0x36, 0xf4, 0xee, 0x34, 0xd2, 0x37, 0x29, - 0x01, 0x91, 0xb7, 0x48, 0xc0, 0x3a, 0x70, 0x5e, 0x9b, 0x8e, 0x75, 0xc4, 0x32, 0x99, 0x2a, 0x2d, - 0x0f, 0x5c, 0x25, 0x1d, 0xe4, 0xc9, 0xb1, 0x8e, 0x54, 0x9c, 0x64, 0x63, 0xaf, 0x50, 0xc7, 0xd9, - 0x8f, 0x9d, 0x0b, 0xfb, 0xf1, 0x09, 0xec, 0x7f, 0x1b, 0x86, 0x95, 0x51, 0xf6, 0xcb, 0xd4, 0x7c, - 0x68, 0x58, 0xbd, 0x69, 0x64, 0xe0, 0x94, 0x2d, 0x4d, 0xef, 0x32, 0xda, 0xcf, 0x60, 0x4b, 0xd3, - 0xbb, 0x3e, 0x5b, 0x5e, 0x5d, 0x8c, 0xb3, 0x15, 0x3d, 0x17, 0xb6, 0x62, 0x13, 0xd8, 0xfa, 0x52, - 0x82, 0xa5, 0x21, 0x5b, 0xe5, 0x7d, 0x6a, 0x93, 0x69, 0x75, 0xd1, 0xa1, 0x73, 0x91, 0x09, 0xce, - 0x7d, 0x1f, 0x86, 0xcc, 0x98, 0x73, 0x53, 0xcc, 0xe5, 0x68, 0xeb, 0x89, 0xfc, 0xcd, 0xd6, 0x33, - 0xdd, 0x74, 0xba, 0x12, 0xcc, 0x6d, 0xdb, 0x6d, 0x4c, 0xf4, 0xc3, 0x1d, 0x4d, 0xef, 0x12, 0x07, - 0x7d, 0x00, 0xf1, 0x3e, 0x1b, 0x31, 0x9e, 0x66, 0x6f, 0xac, 0x9e, 0xd9, 0xd1, 0x39, 0x58, 0x34, - 0x74, 0x31, 0x01, 0x2d, 0x43, 0x8c, 0xed, 0xce, 0x18, 0x4b, 0x61, 0x2e, 0xbc, 0x16, 0x60, 0xe4, - 0x5c, 0x02, 0x9c, 0x74, 0x35, 0x7e, 0x13, 0x06, 0xd8, 0xb6, 0xdb, 0x0d, 0xa3, 0x47, 0xe8, 0xc1, - 0x7f, 0x2c, 0xba, 0xbb, 0x80, 0x4c, 0xf2, 0xd8, 0x69, 0xda, 0xe4, 0xb3, 0x03, 0x62, 0xea, 0xa4, - 0x69, 0x11, 0xfd, 0x90, 0x45, 0x1a, 0x2d, 0x5d, 0x1e, 0xb8, 0xca, 0x45, 0xbe, 0xc2, 0xeb, 0x18, - 0x15, 0xa7, 0x3d, 0xe5, 0xae, 0xd0, 0x79, 0xd9, 0xfd, 0x0b, 0xb5, 0xf0, 0x8a, 0x5f, 0x43, 0x82, - 0xaa, 0xba, 0xc9, 0xce, 0xcf, 0x3f, 0xcf, 0xd8, 0xfb, 0xc0, 0x83, 0x6c, 0xea, 0xde, 0xfa, 0xe2, - 0x9c, 0x64, 0x06, 0xae, 0x82, 0x82, 0x84, 0x30, 0xa3, 0x8a, 0xf9, 0x89, 0xe2, 0x9e, 0x9c, 0xe7, - 0x49, 0x39, 0x9b, 0xea, 0xd8, 0xdb, 0x52, 0x3d, 0xe9, 0xce, 0xf9, 0x3c, 0xcc, 0x9e, 0xa2, 0x1b, - 0x7a, 0xd7, 0xa4, 0x8f, 0xf6, 0x49, 0xab, 0x4d, 0x7a, 0xc4, 0x7c, 0xab, 0xea, 0x5c, 0x83, 0x05, - 0x6d, 0x74, 0x35, 0xc1, 0xfa, 0xb8, 0x7a, 0x98, 0x95, 0xc8, 0x9b, 0xea, 0x78, 0xba, 0x6d, 0xe8, - 0xeb, 0x30, 0x24, 0x44, 0xd7, 0x46, 0xd7, 0x21, 0x66, 0x3b, 0x9a, 0x43, 0x18, 0x07, 0xf3, 0x23, - 0x2e, 0x0c, 0x39, 0xd8, 0xf5, 0x10, 0x98, 0x03, 0xd1, 0x7b, 0x90, 0xa4, 0x56, 0x8b, 0x58, 0x86, - 0xd9, 0x66, 0x41, 0x4f, 0x9a, 0x54, 0xf7, 0x40, 0xf8, 0x14, 0x8b, 0xee, 0x42, 0x2a, 0xf8, 0x82, - 0x11, 0x67, 0xf7, 0xca, 0xd9, 0x4f, 0xd8, 0x00, 0x50, 0x50, 0x3f, 0x32, 0x19, 0x95, 0x61, 0x41, - 0xa7, 0xa6, 0x49, 0x74, 0xc7, 0xa0, 0x66, 0xb3, 0x43, 0xfb, 0xb6, 0x1c, 0xcd, 0x47, 0xd6, 0x66, - 0x4a, 0xd9, 0x81, 0xab, 0x64, 0xfc, 0x67, 0xd4, 0x08, 0x40, 0xc5, 0xf3, 0x43, 0xcd, 0x16, 0xed, - 0xdb, 0x48, 0x86, 0x84, 0xff, 0x06, 0xe3, 0x54, 0xf9, 0xe2, 0xed, 0xa8, 0xc7, 0x95, 0xfa, 0x6b, - 0x18, 0x16, 0xab, 0x2d, 0x62, 0x3a, 0xc6, 0x43, 0x83, 0xb4, 0xfe, 0x67, 0xec, 0x0d, 0x8c, 0xa1, - 0x0b, 0xc3, 0x1b, 0x5f, 0x1c, 0x43, 0x71, 0xbb, 0x5f, 0x1e, 0xb9, 0xdd, 0xf9, 0xa3, 0x7c, 0x78, - 0x8d, 0x0b, 0xa6, 0x1f, 0x41, 0x2a, 0x18, 0xc0, 0x14, 0xde, 0x0f, 0x62, 0xe3, 0xdf, 0x23, 0x10, - 0x17, 0x57, 0x71, 0x16, 0x92, 0x7e, 0xaf, 0x61, 0x9b, 0x46, 0xf1, 0xa9, 0xec, 0x75, 0x51, 0x9b, - 0x1e, 0x58, 0x3a, 0x69, 0x7a, 0x7b, 0x8a, 0x3d, 0x02, 0x5d, 0x34, 0x60, 0x54, 0x31, 0x70, 0x69, - 0x87, 0x5a, 0x0e, 0xfa, 0x08, 0xe6, 0x85, 0x2d, 0xf8, 0xe5, 0x36, 0x53, 0xba, 0x38, 0x70, 0x95, - 0x95, 0x91, 0xb9, 0xc2, 0xae, 0xe2, 0x39, 0xae, 0xf0, 0xcb, 0xed, 0x0e, 0xa4, 0x5b, 0xc4, 0x76, - 0x0c, 0x53, 0x63, 0x79, 0x61, 0xfb, 0xf3, 0x4f, 0xb6, 0xd5, 0x81, 0xab, 0x5c, 0xe0, 0x6b, 0x8c, - 0x23, 0x54, 0xbc, 0x10, 0x50, 0x31, 0x4f, 0xea, 0xb0, 0x14, 0x44, 0xf9, 0xee, 0xb0, 0x34, 0x96, - 0x72, 0x03, 0x57, 0xc9, 0xbe, 0xbe, 0xd4, 0xa9, 0x4f, 0x28, 0xa0, 0xf5, 0x1d, 0x43, 0x10, 0x6d, - 0x69, 0x8e, 0xc6, 0xd2, 0x9d, 0xc2, 0x6c, 0x8c, 0x3e, 0x85, 0x79, 0x87, 0x5f, 0x68, 0x7e, 0x67, - 0x4b, 0xfc, 0x69, 0x67, 0xbb, 0x2c, 0x3a, 0x9b, 0xa0, 0x63, 0x74, 0xbe, 0x8a, 0xe7, 0x84, 0x42, - 0x74, 0xb7, 0x2a, 0x2c, 0xfa, 0x08, 0xef, 0xd7, 0x76, 0xb4, 0x5e, 0x5f, 0x4e, 0xb2, 0x9b, 0xe3, - 0xd2, 0xc0, 0x55, 0xe4, 0xd1, 0x45, 0x4e, 0x21, 0x2a, 0x4e, 0x0b, 0x5d, 0xc3, 0x57, 0x89, 0x0a, - 0xf8, 0x4e, 0x82, 0x25, 0x5e, 0x01, 0x1b, 0x7a, 0xb7, 0x4c, 0x7b, 0x3d, 0xc3, 0x61, 0x8d, 0x7b, - 0x0a, 0x4f, 0xd8, 0x60, 0xc5, 0x45, 0xc6, 0x2a, 0x0e, 0x41, 0xb4, 0xa3, 0xd9, 0x1d, 0xfe, 0x4d, - 0x87, 0xd9, 0x58, 0x38, 0x5c, 0x87, 0x85, 0xf1, 0x9b, 0x4c, 0x86, 0xb8, 0x45, 0xec, 0x83, 0x7d, - 0x47, 0x5e, 0xf1, 0xe0, 0x5b, 0x21, 0x2c, 0x64, 0x94, 0x81, 0x18, 0xb1, 0x2c, 0x6a, 0xc9, 0x19, - 0xcf, 0xa7, 0xad, 0x10, 0xe6, 0x62, 0x09, 0x20, 0x69, 0x11, 0xbb, 0x4f, 0x4d, 0x9b, 0x5c, 0xfd, - 0x41, 0x82, 0xd8, 0xae, 0x68, 0x54, 0xca, 0x6e, 0x63, 0xa3, 0x51, 0x69, 0xde, 0xaf, 0x55, 0x6b, - 0xd5, 0x46, 0x75, 0xe3, 0x5e, 0xf5, 0x41, 0x65, 0xb3, 0x79, 0xbf, 0xb6, 0xbb, 0x53, 0x29, 0x57, - 0xef, 0x54, 0x2b, 0x9b, 0xe9, 0x50, 0x76, 0xf1, 0xf8, 0x24, 0x3f, 0x37, 0x02, 0x40, 0x32, 0x00, - 0x9f, 0xe7, 0x29, 0xd3, 0x52, 0x36, 0x79, 0x7c, 0x92, 0x8f, 0x7a, 0x63, 0x94, 0x83, 0x39, 0x6e, - 0x69, 0xe0, 0x4f, 0xea, 0x3b, 0x95, 0x5a, 0x3a, 0x9c, 0x9d, 0x3d, 0x3e, 0xc9, 0x27, 0x84, 0x38, - 0x9c, 0xc9, 0x8c, 0x11, 0x3e, 0x93, 0x59, 0x2e, 0x41, 0x8a, 0x5b, 0xca, 0xf7, 0xea, 0xbb, 0x95, - 0xcd, 0x74, 0x34, 0x0b, 0xc7, 0x27, 0xf9, 0x38, 0x97, 0xb2, 0xd1, 0x27, 0x5f, 0xe5, 0x42, 0x57, - 0x1f, 0x41, 0x8c, 0xf5, 0x4c, 0xf4, 0x0e, 0x64, 0xea, 0x78, 0xb3, 0x82, 0x9b, 0xb5, 0x7a, 0xad, - 0x32, 0xe6, 0x2f, 0x5b, 0xd2, 0xd3, 0x23, 0x15, 0x16, 0x38, 0xea, 0x7e, 0x8d, 0xfd, 0x56, 0x36, - 0xd3, 0x52, 0x76, 0xee, 0xf8, 0x24, 0x3f, 0x73, 0xaa, 0xf0, 0x1c, 0xe6, 0x18, 0x1f, 0x21, 0x1c, - 0x16, 0x22, 0xdf, 0xb8, 0xb4, 0xfd, 0xec, 0x45, 0x4e, 0x7a, 0xfe, 0x22, 0x27, 0xfd, 0xf2, 0x22, - 0x27, 0x7d, 0xf1, 0x32, 0x17, 0x7a, 0xfe, 0x32, 0x17, 0xfa, 0xf9, 0x65, 0x2e, 0xf4, 0xe0, 0x66, - 0xdb, 0x70, 0x3a, 0x07, 0x7b, 0x05, 0x9d, 0xf6, 0x8a, 0x3a, 0xb5, 0x7b, 0xd4, 0x16, 0x3f, 0xd7, - 0xec, 0x56, 0xb7, 0xf8, 0xb8, 0x68, 0xec, 0xe9, 0xc5, 0xeb, 0xb7, 0xae, 0xf9, 0x7f, 0xc1, 0x39, - 0x47, 0x7d, 0x62, 0xef, 0xc5, 0xd9, 0x5f, 0x66, 0x37, 0xff, 0x08, 0x00, 0x00, 0xff, 0xff, 0x90, - 0xdd, 0xaf, 0x5a, 0xa3, 0x13, 0x00, 0x00, + // 1385 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0xcf, 0x6b, 0x1b, 0xc7, + 0x17, 0xd7, 0xea, 0xb7, 0x9f, 0x65, 0x5b, 0x1e, 0xdb, 0xca, 0x46, 0x4e, 0xb4, 0xca, 0xf2, 0x3d, + 0x98, 0x7c, 0x89, 0x14, 0xe7, 0x1b, 0xbe, 0x6d, 0x43, 0x0f, 0xb5, 0x64, 0x05, 0x8b, 0x24, 0x92, + 0x19, 0x2b, 0x85, 0xe6, 0xa2, 0xae, 0x57, 0x13, 0x69, 0x91, 0xb5, 0xa3, 0xee, 0xae, 0x9d, 0xf8, + 0x3f, 0x08, 0x86, 0x42, 0xcf, 0x05, 0x43, 0xa0, 0x14, 0x0a, 0x85, 0xf6, 0xd8, 0x4b, 0xff, 0x80, + 0x1c, 0x73, 0x6b, 0x4f, 0x4b, 0x49, 0x0e, 0xcd, 0x59, 0xd7, 0x1e, 0x5a, 0x76, 0x66, 0x56, 0x5a, + 0x29, 0x56, 0x5a, 0x9a, 0x5a, 0xb4, 0xd0, 0x93, 0xe6, 0xbd, 0xf7, 0x99, 0x99, 0xf7, 0x3e, 0xef, + 0xcd, 0x9b, 0xd1, 0xc2, 0x15, 0x63, 0x5f, 0x2f, 0xea, 0xd4, 0x22, 0x45, 0xbd, 0xa3, 0x99, 0x26, + 0x39, 0x28, 0x1e, 0x6d, 0xfa, 0xc3, 0x42, 0xdf, 0xa2, 0x0e, 0x45, 0x2b, 0xc6, 0xbe, 0x5e, 0xf0, + 0x20, 0x05, 0x5f, 0x7f, 0xb4, 0x99, 0x5d, 0x6d, 0xd3, 0x36, 0x65, 0xf6, 0xa2, 0x37, 0xe2, 0xd0, + 0xac, 0x32, 0x5a, 0xed, 0xc0, 0x20, 0xa6, 0xc3, 0x16, 0x63, 0x23, 0x0e, 0x50, 0x7f, 0x90, 0x00, + 0xdd, 0xb3, 0xdb, 0x65, 0xbe, 0x50, 0xbd, 0x4f, 0xcc, 0xaa, 0x69, 0x38, 0xe8, 0xbf, 0x90, 0xe8, + 0x53, 0xcb, 0x69, 0x1a, 0x2d, 0x59, 0xca, 0x4b, 0x1b, 0x73, 0x25, 0x34, 0x70, 0x95, 0xc5, 0x63, + 0xad, 0x77, 0x70, 0x4b, 0x15, 0x06, 0x15, 0xc7, 0xbd, 0x51, 0xb5, 0x85, 0x6e, 0x02, 0x08, 0x47, + 0x3c, 0x7c, 0x98, 0xe1, 0xd7, 0x06, 0xae, 0xb2, 0xcc, 0xf1, 0x23, 0x9b, 0x8a, 0xe7, 0x84, 0x50, + 0x6d, 0xa1, 0xf7, 0x21, 0x21, 0x04, 0x39, 0x92, 0x97, 0x36, 0xe6, 0x6f, 0x5c, 0x2a, 0x9c, 0x11, + 0x57, 0x41, 0x78, 0x56, 0x8a, 0x3e, 0x73, 0x95, 0x10, 0xf6, 0xa7, 0xa0, 0x0c, 0xc4, 0x6d, 0xa3, + 0x6d, 0x12, 0x4b, 0x8e, 0x7a, 0xfb, 0x61, 0x21, 0xdd, 0x4a, 0x3e, 0x79, 0xaa, 0x84, 0x5e, 0x3d, + 0x55, 0x42, 0xea, 0xf7, 0x11, 0x58, 0x1e, 0x8f, 0xac, 0x61, 0x1d, 0xff, 0xfd, 0x03, 0xc3, 0xb0, + 0xaa, 0xd3, 0x43, 0xd3, 0x21, 0x56, 0x5f, 0xb3, 0x9c, 0xe3, 0xe6, 0x11, 0xb1, 0x6c, 0x83, 0x9a, + 0x3c, 0xcc, 0x92, 0x32, 0x70, 0x95, 0x75, 0xb1, 0xfb, 0x19, 0x28, 0x15, 0xaf, 0x04, 0xd5, 0x1f, + 0x72, 0xad, 0x17, 0x47, 0xdf, 0xa2, 0xf4, 0x61, 0xd3, 0x30, 0x0d, 0x47, 0x8e, 0xe5, 0xa5, 0x8d, + 0x54, 0x30, 0x8e, 0x91, 0x4d, 0xc5, 0x73, 0x4c, 0x60, 0x35, 0xf0, 0x00, 0x52, 0xdc, 0xd2, 0x21, + 0x46, 0xbb, 0xe3, 0xc8, 0x71, 0x16, 0x4c, 0x36, 0x10, 0x0c, 0x2f, 0xa4, 0xa3, 0xcd, 0xc2, 0x0e, + 0x43, 0x94, 0xd6, 0xbd, 0x50, 0x06, 0xae, 0xb2, 0x12, 0x5c, 0x97, 0xcf, 0x56, 0xf1, 0x3c, 0x13, + 0x39, 0x32, 0x90, 0xbe, 0xc4, 0x94, 0xf4, 0xfd, 0x12, 0x9e, 0x4c, 0xdf, 0x96, 0xde, 0x9d, 0x45, + 0xfa, 0xa6, 0x25, 0x20, 0xf2, 0x16, 0x09, 0xd8, 0x04, 0xce, 0x6b, 0xd3, 0xb1, 0x8e, 0x59, 0x26, + 0x53, 0xa5, 0xd5, 0x81, 0xab, 0xa4, 0x83, 0x3c, 0x39, 0xd6, 0xb1, 0x8a, 0x93, 0x6c, 0xec, 0x15, + 0xea, 0x24, 0xfb, 0xb1, 0x73, 0x61, 0x3f, 0x3e, 0x85, 0xfd, 0xaf, 0xc3, 0xb0, 0x36, 0xce, 0x7e, + 0x99, 0x9a, 0x0f, 0x0d, 0xab, 0x37, 0x8b, 0x0c, 0x0c, 0xd9, 0xd2, 0xf4, 0x2e, 0xa3, 0xfd, 0x0c, + 0xb6, 0x34, 0xbd, 0xeb, 0xb3, 0xe5, 0xd5, 0xc5, 0x24, 0x5b, 0xd1, 0x73, 0x61, 0x2b, 0x36, 0x85, + 0xad, 0xcf, 0x25, 0x58, 0x19, 0xb1, 0x55, 0x3e, 0xa0, 0x36, 0x99, 0x55, 0x17, 0x1d, 0x39, 0x17, + 0x99, 0xe2, 0xdc, 0xb7, 0x61, 0xc8, 0x4c, 0x38, 0x37, 0xc3, 0x5c, 0x8e, 0xb7, 0x9e, 0xc8, 0x9f, + 0x6c, 0x3d, 0xb3, 0x4d, 0xa7, 0x2b, 0xc1, 0xc2, 0x3d, 0xbb, 0x8d, 0x89, 0x7e, 0xb4, 0xab, 0xe9, + 0x5d, 0xe2, 0xa0, 0xf7, 0x20, 0xde, 0x67, 0x23, 0xc6, 0xd3, 0xfc, 0x8d, 0xf5, 0x33, 0x3b, 0x3a, + 0x07, 0x8b, 0x86, 0x2e, 0x26, 0xa0, 0x55, 0x88, 0xb1, 0xdd, 0x19, 0x63, 0x29, 0xcc, 0x85, 0xd7, + 0x02, 0x8c, 0x9c, 0x4b, 0x80, 0xd3, 0xae, 0xc6, 0xaf, 0xc2, 0x00, 0xf7, 0xec, 0x76, 0xc3, 0xe8, + 0x11, 0x7a, 0xf8, 0x0f, 0x8b, 0xee, 0x0e, 0x20, 0x93, 0x3c, 0x76, 0x9a, 0x36, 0xf9, 0xe4, 0x90, + 0x98, 0x3a, 0x69, 0x5a, 0x44, 0x3f, 0x62, 0x91, 0x46, 0x4b, 0x97, 0x07, 0xae, 0x72, 0x91, 0xaf, + 0xf0, 0x3a, 0x46, 0xc5, 0x69, 0x4f, 0xb9, 0x27, 0x74, 0x5e, 0x76, 0xff, 0x40, 0x2d, 0xbc, 0xe2, + 0xd7, 0x90, 0xa0, 0xaa, 0x6e, 0xb2, 0xf3, 0xf3, 0xd7, 0x33, 0xf6, 0x0e, 0xf0, 0x20, 0x9b, 0xba, + 0xb7, 0xbe, 0x38, 0x27, 0x99, 0x81, 0xab, 0xa0, 0x20, 0x21, 0xcc, 0xa8, 0x62, 0x7e, 0xa2, 0xb8, + 0x27, 0xe7, 0x79, 0x52, 0xce, 0xa6, 0x3a, 0xf6, 0xb6, 0x54, 0x4f, 0xbb, 0x73, 0x3e, 0x0d, 0xb3, + 0xa7, 0xe8, 0x96, 0xde, 0x35, 0xe9, 0xa3, 0x03, 0xd2, 0x6a, 0x93, 0x1e, 0x31, 0xdf, 0xaa, 0x3a, + 0x37, 0x60, 0x49, 0x1b, 0x5f, 0x4d, 0xb0, 0x3e, 0xa9, 0x1e, 0x65, 0x25, 0xf2, 0xa6, 0x3a, 0x9e, + 0x6d, 0x1b, 0xfa, 0x32, 0x0c, 0x09, 0xd1, 0xb5, 0xd1, 0x75, 0x88, 0xd9, 0x8e, 0xe6, 0x10, 0xc6, + 0xc1, 0xe2, 0x98, 0x0b, 0x23, 0x0e, 0xf6, 0x3c, 0x04, 0xe6, 0x40, 0xf4, 0x7f, 0x48, 0x52, 0xab, + 0x45, 0x2c, 0xc3, 0x6c, 0xb3, 0xa0, 0xa7, 0x4d, 0xaa, 0x7b, 0x20, 0x3c, 0xc4, 0xa2, 0x3b, 0x90, + 0x0a, 0xbe, 0x60, 0xc4, 0xd9, 0xbd, 0x72, 0xf6, 0x13, 0x36, 0x00, 0x14, 0xd4, 0x8f, 0x4d, 0x46, + 0x65, 0x58, 0xd2, 0xa9, 0x69, 0x12, 0xdd, 0x31, 0xa8, 0xd9, 0xec, 0xd0, 0xbe, 0x2d, 0x47, 0xf3, + 0x91, 0x8d, 0xb9, 0x52, 0x76, 0xe0, 0x2a, 0x19, 0xff, 0x19, 0x35, 0x06, 0x50, 0xf1, 0xe2, 0x48, + 0xb3, 0x43, 0xfb, 0x36, 0x92, 0x21, 0xe1, 0xbf, 0xc1, 0x38, 0x55, 0xbe, 0x78, 0x2b, 0xea, 0x71, + 0xa5, 0xfe, 0x1c, 0x86, 0xe5, 0x6a, 0x8b, 0x98, 0x8e, 0xf1, 0xd0, 0x20, 0xad, 0x7f, 0x19, 0x7b, + 0x03, 0x63, 0xe8, 0xc2, 0xe8, 0xc6, 0x17, 0xc7, 0x50, 0xdc, 0xee, 0x97, 0xc7, 0x6e, 0x77, 0xfe, + 0x28, 0x1f, 0x5d, 0xe3, 0x82, 0xe9, 0x47, 0x90, 0x0a, 0x06, 0x30, 0x83, 0xf7, 0x83, 0xd8, 0xf8, + 0xd7, 0x08, 0xc4, 0xc5, 0x55, 0x9c, 0x85, 0xa4, 0xdf, 0x6b, 0xd8, 0xa6, 0x51, 0x3c, 0x94, 0xbd, + 0x2e, 0x6a, 0xd3, 0x43, 0x4b, 0x27, 0x4d, 0x6f, 0x4f, 0xb1, 0x47, 0xa0, 0x8b, 0x06, 0x8c, 0x2a, + 0x06, 0x2e, 0xed, 0x52, 0xcb, 0x41, 0x1f, 0xc0, 0xa2, 0xb0, 0x05, 0xff, 0xb9, 0xcd, 0x95, 0x2e, + 0x0e, 0x5c, 0x65, 0x6d, 0x6c, 0xae, 0xb0, 0xab, 0x78, 0x81, 0x2b, 0xfc, 0x72, 0xbb, 0x0d, 0xe9, + 0x16, 0xb1, 0x1d, 0xc3, 0xd4, 0x58, 0x5e, 0xd8, 0xfe, 0xfc, 0x2f, 0xdb, 0xfa, 0xc0, 0x55, 0x2e, + 0xf0, 0x35, 0x26, 0x11, 0x2a, 0x5e, 0x0a, 0xa8, 0x98, 0x27, 0x75, 0x58, 0x09, 0xa2, 0x7c, 0x77, + 0x58, 0x1a, 0x4b, 0xb9, 0x81, 0xab, 0x64, 0x5f, 0x5f, 0x6a, 0xe8, 0x13, 0x0a, 0x68, 0x7d, 0xc7, + 0x10, 0x44, 0x5b, 0x9a, 0xa3, 0xb1, 0x74, 0xa7, 0x30, 0x1b, 0xa3, 0x8f, 0x61, 0xd1, 0xe1, 0x17, + 0x9a, 0xdf, 0xd9, 0x12, 0xbf, 0xdb, 0xd9, 0x2e, 0x8b, 0xce, 0x26, 0xe8, 0x18, 0x9f, 0xaf, 0xe2, + 0x05, 0xa1, 0x10, 0xdd, 0xad, 0x0a, 0xcb, 0x3e, 0xc2, 0xfb, 0xb5, 0x1d, 0xad, 0xd7, 0x97, 0x93, + 0xec, 0xe6, 0xb8, 0x34, 0x70, 0x15, 0x79, 0x7c, 0x91, 0x21, 0x44, 0xc5, 0x69, 0xa1, 0x6b, 0xf8, + 0x2a, 0x51, 0x01, 0xdf, 0x48, 0xb0, 0xc2, 0x2b, 0x60, 0x4b, 0xef, 0x96, 0x69, 0xaf, 0x67, 0x38, + 0xac, 0x71, 0xcf, 0xe0, 0x09, 0x1b, 0xac, 0xb8, 0xc8, 0x44, 0xc5, 0x21, 0x88, 0x76, 0x34, 0xbb, + 0xc3, 0xff, 0xd3, 0x61, 0x36, 0x16, 0x0e, 0xd7, 0x61, 0x69, 0xf2, 0x26, 0x93, 0x21, 0x6e, 0x11, + 0xfb, 0xf0, 0xc0, 0x91, 0xd7, 0x3c, 0xf8, 0x4e, 0x08, 0x0b, 0x19, 0x65, 0x20, 0x46, 0x2c, 0x8b, + 0x5a, 0x72, 0xc6, 0xf3, 0x69, 0x27, 0x84, 0xb9, 0x58, 0x02, 0x48, 0x5a, 0xc4, 0xee, 0x53, 0xd3, + 0x26, 0x57, 0xbf, 0x93, 0x20, 0xb6, 0x27, 0x1a, 0x95, 0xb2, 0xd7, 0xd8, 0x6a, 0x54, 0x9a, 0xf7, + 0x6b, 0xd5, 0x5a, 0xb5, 0x51, 0xdd, 0xba, 0x5b, 0x7d, 0x50, 0xd9, 0x6e, 0xde, 0xaf, 0xed, 0xed, + 0x56, 0xca, 0xd5, 0xdb, 0xd5, 0xca, 0x76, 0x3a, 0x94, 0x5d, 0x3e, 0x39, 0xcd, 0x2f, 0x8c, 0x01, + 0x90, 0x0c, 0xc0, 0xe7, 0x79, 0xca, 0xb4, 0x94, 0x4d, 0x9e, 0x9c, 0xe6, 0xa3, 0xde, 0x18, 0xe5, + 0x60, 0x81, 0x5b, 0x1a, 0xf8, 0xa3, 0xfa, 0x6e, 0xa5, 0x96, 0x0e, 0x67, 0xe7, 0x4f, 0x4e, 0xf3, + 0x09, 0x21, 0x8e, 0x66, 0x32, 0x63, 0x84, 0xcf, 0x64, 0x96, 0x4b, 0x90, 0xe2, 0x96, 0xf2, 0xdd, + 0xfa, 0x5e, 0x65, 0x3b, 0x1d, 0xcd, 0xc2, 0xc9, 0x69, 0x3e, 0xce, 0xa5, 0x6c, 0xf4, 0xc9, 0x17, + 0xb9, 0xd0, 0xd5, 0x47, 0x10, 0x63, 0x3d, 0x13, 0xfd, 0x07, 0x32, 0x75, 0xbc, 0x5d, 0xc1, 0xcd, + 0x5a, 0xbd, 0x56, 0x99, 0xf0, 0x97, 0x2d, 0xe9, 0xe9, 0x91, 0x0a, 0x4b, 0x1c, 0x75, 0xbf, 0xc6, + 0x7e, 0x2b, 0xdb, 0x69, 0x29, 0xbb, 0x70, 0x72, 0x9a, 0x9f, 0x1b, 0x2a, 0x3c, 0x87, 0x39, 0xc6, + 0x47, 0x08, 0x87, 0x85, 0xc8, 0x37, 0x2e, 0xe1, 0x67, 0x2f, 0x72, 0xd2, 0xf3, 0x17, 0x39, 0xe9, + 0xa7, 0x17, 0x39, 0xe9, 0xb3, 0x97, 0xb9, 0xd0, 0xf3, 0x97, 0xb9, 0xd0, 0x8f, 0x2f, 0x73, 0xa1, + 0x07, 0xef, 0xb6, 0x0d, 0xa7, 0x73, 0xb8, 0x5f, 0xd0, 0x69, 0xaf, 0xa8, 0x53, 0xbb, 0x47, 0x6d, + 0xf1, 0x73, 0xcd, 0x6e, 0x75, 0x8b, 0x8f, 0x8b, 0xc3, 0xcf, 0x66, 0xd7, 0x6f, 0x5e, 0xf3, 0xbf, + 0xc3, 0x39, 0xc7, 0x7d, 0x62, 0xef, 0xc7, 0xd9, 0x77, 0xb3, 0xff, 0xfd, 0x16, 0x00, 0x00, 0xff, + 0xff, 0xcb, 0x1c, 0xab, 0x37, 0xa8, 0x13, 0x00, 0x00, } func (m *MsgChannelOpenInit) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/04-channel/types/channel_test.go b/x/ibc/core/04-channel/types/channel_test.go similarity index 96% rename from x/ibc/04-channel/types/channel_test.go rename to x/ibc/core/04-channel/types/channel_test.go index a5c528bbf9..14592d4b4c 100644 --- a/x/ibc/04-channel/types/channel_test.go +++ b/x/ibc/core/04-channel/types/channel_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) func TestCounterpartyValidateBasic(t *testing.T) { diff --git a/x/ibc/04-channel/types/codec.go b/x/ibc/core/04-channel/types/codec.go similarity index 89% rename from x/ibc/04-channel/types/codec.go rename to x/ibc/core/04-channel/types/codec.go index 5a1ce1dcf6..6ea150a792 100644 --- a/x/ibc/04-channel/types/codec.go +++ b/x/ibc/core/04-channel/types/codec.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // RegisterInterfaces register the ibc channel submodule interfaces to protobuf @@ -49,9 +49,9 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { ) } -// SubModuleCdc references the global x/ibc/04-channel module codec. Note, the codec should +// SubModuleCdc references the global x/ibc/core/04-channel module codec. Note, the codec should // ONLY be used in certain instances of tests and for JSON encoding. // -// The actual codec used for serialization should be provided to x/ibc/04-channel and +// The actual codec used for serialization should be provided to x/ibc/core/04-channel and // defined at the application level. var SubModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry()) diff --git a/x/ibc/04-channel/types/errors.go b/x/ibc/core/04-channel/types/errors.go similarity index 100% rename from x/ibc/04-channel/types/errors.go rename to x/ibc/core/04-channel/types/errors.go diff --git a/x/ibc/04-channel/types/events.go b/x/ibc/core/04-channel/types/events.go similarity index 96% rename from x/ibc/04-channel/types/events.go rename to x/ibc/core/04-channel/types/events.go index bd01adeee4..66c1d078ee 100644 --- a/x/ibc/04-channel/types/events.go +++ b/x/ibc/core/04-channel/types/events.go @@ -3,7 +3,7 @@ package types import ( "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // IBC channel events diff --git a/x/ibc/04-channel/types/expected_keepers.go b/x/ibc/core/04-channel/types/expected_keepers.go similarity index 93% rename from x/ibc/04-channel/types/expected_keepers.go rename to x/ibc/core/04-channel/types/expected_keepers.go index 194a543235..d3b74b7e29 100644 --- a/x/ibc/04-channel/types/expected_keepers.go +++ b/x/ibc/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/03-connection/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // ClientKeeper expected account IBC client keeper diff --git a/x/ibc/04-channel/types/genesis.go b/x/ibc/core/04-channel/types/genesis.go similarity index 98% rename from x/ibc/04-channel/types/genesis.go rename to x/ibc/core/04-channel/types/genesis.go index 8306fbf887..708872eb86 100644 --- a/x/ibc/04-channel/types/genesis.go +++ b/x/ibc/core/04-channel/types/genesis.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // NewPacketAckCommitment creates a new PacketAckCommitment instance. diff --git a/x/ibc/04-channel/types/genesis.pb.go b/x/ibc/core/04-channel/types/genesis.pb.go similarity index 88% rename from x/ibc/04-channel/types/genesis.pb.go rename to x/ibc/core/04-channel/types/genesis.pb.go index 74c6fdc880..53ddffa0ec 100644 --- a/x/ibc/04-channel/types/genesis.pb.go +++ b/x/ibc/core/04-channel/types/genesis.pb.go @@ -181,34 +181,34 @@ var fileDescriptor_cb06ec201f452595 = []byte{ // 470 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x41, 0x6f, 0xd3, 0x30, 0x18, 0x86, 0x9b, 0xb5, 0x94, 0xcd, 0x5b, 0x2b, 0xe6, 0x6d, 0x52, 0x28, 0x90, 0x94, 0x20, 0xa1, - 0x4a, 0x68, 0x09, 0x63, 0x3b, 0x71, 0x23, 0x3b, 0xa0, 0x1e, 0x90, 0x26, 0xef, 0x86, 0x84, 0xa6, - 0xd4, 0xf9, 0x96, 0x59, 0x69, 0xec, 0xae, 0xf6, 0x0a, 0xfb, 0x15, 0xf0, 0xb3, 0x76, 0xdc, 0x91, - 0x53, 0x84, 0xda, 0x3f, 0x80, 0x7a, 0xe4, 0x84, 0x9c, 0xb8, 0x5d, 0xab, 0x55, 0x08, 0x38, 0x25, - 0xf6, 0xfb, 0x7e, 0xcf, 0xe3, 0xcb, 0x87, 0x9e, 0xb3, 0x1e, 0x0d, 0xa8, 0x18, 0x42, 0x40, 0x2f, - 0x22, 0xce, 0xa1, 0x1f, 0x8c, 0x0e, 0x82, 0x04, 0x38, 0x48, 0x26, 0xfd, 0xc1, 0x50, 0x28, 0x81, - 0x77, 0x58, 0x8f, 0xfa, 0xba, 0xe2, 0x9b, 0x8a, 0x3f, 0x3a, 0x68, 0xed, 0x26, 0x22, 0x11, 0x45, - 0x1e, 0xe8, 0xbf, 0xb2, 0xda, 0x5a, 0x49, 0x9b, 0x4d, 0x15, 0x15, 0xef, 0x67, 0x0d, 0x6d, 0xbd, - 0x2f, 0xf9, 0xa7, 0x2a, 0x52, 0x80, 0x3f, 0xa1, 0x75, 0xd3, 0x90, 0xb6, 0xd5, 0xae, 0x76, 0x36, - 0xdf, 0xbc, 0xf4, 0x57, 0x18, 0xfd, 0x6e, 0x0c, 0x5c, 0xb1, 0x73, 0x06, 0xf1, 0x71, 0x79, 0x19, - 0x3e, 0xbe, 0xc9, 0xdd, 0xca, 0xaf, 0xdc, 0xdd, 0xbe, 0x17, 0x91, 0x39, 0x12, 0x5f, 0xa2, 0x47, - 0x11, 0x4d, 0xb9, 0xf8, 0xdc, 0x87, 0x38, 0x81, 0x0c, 0xb8, 0x92, 0xf6, 0x5a, 0xa1, 0xe9, 0xac, - 0xd4, 0x9c, 0x44, 0x34, 0x05, 0xf5, 0x8e, 0xa6, 0xc7, 0x22, 0xcb, 0x98, 0xd2, 0x03, 0xe1, 0x13, - 0x23, 0xda, 0x59, 0x11, 0x92, 0x7b, 0x78, 0x7c, 0x82, 0x36, 0xe9, 0x3c, 0x97, 0x76, 0xf5, 0x1f, - 0x6d, 0x35, 0x6d, 0x23, 0x8b, 0x08, 0xcc, 0x50, 0x53, 0x02, 0x8f, 0xcf, 0x24, 0x5c, 0x5e, 0x01, - 0xa7, 0x20, 0xed, 0x5a, 0x01, 0x7d, 0xf1, 0x07, 0xe8, 0xa9, 0xe9, 0x86, 0xcf, 0x34, 0x6f, 0x9a, - 0xbb, 0x7b, 0xd7, 0x51, 0xd6, 0x7f, 0xeb, 0x2d, 0x83, 0x3c, 0xd2, 0xd0, 0x17, 0xb3, 0x72, 0xa1, - 0x1a, 0x02, 0x1d, 0x2d, 0xa8, 0x1e, 0xfc, 0xb7, 0x6a, 0x19, 0xe4, 0x91, 0x86, 0xbe, 0xb8, 0x53, - 0x9d, 0xa3, 0x46, 0x44, 0xd3, 0x05, 0x53, 0xfd, 0xef, 0x4d, 0x4f, 0x8d, 0x69, 0xb7, 0x34, 0x2d, - 0x71, 0x3c, 0xb2, 0x15, 0xd1, 0x74, 0xee, 0xf1, 0xbe, 0x5a, 0xa8, 0xb9, 0x3c, 0x8e, 0x5f, 0xa1, - 0x87, 0x03, 0x31, 0x54, 0x67, 0x2c, 0xb6, 0xad, 0xb6, 0xd5, 0xd9, 0x08, 0xf1, 0x34, 0x77, 0x9b, - 0x25, 0xcb, 0x04, 0x1e, 0xa9, 0xeb, 0xbf, 0x6e, 0x8c, 0x8f, 0x10, 0x32, 0x0f, 0xd1, 0xfd, 0xb5, - 0xa2, 0xbf, 0x37, 0xcd, 0xdd, 0xed, 0xb2, 0x7f, 0x97, 0x79, 0x64, 0xc3, 0x1c, 0xba, 0x31, 0x6e, - 0xa1, 0xf5, 0xd9, 0x8b, 0xec, 0x6a, 0xdb, 0xea, 0xd4, 0xc8, 0xfc, 0x1c, 0x7e, 0xb8, 0x19, 0x3b, - 0xd6, 0xed, 0xd8, 0xb1, 0x7e, 0x8c, 0x1d, 0xeb, 0xdb, 0xc4, 0xa9, 0xdc, 0x4e, 0x9c, 0xca, 0xf7, - 0x89, 0x53, 0xf9, 0x78, 0x98, 0x30, 0x75, 0x71, 0xd5, 0xf3, 0xa9, 0xc8, 0x02, 0x2a, 0x64, 0x26, - 0xa4, 0xf9, 0xec, 0xcb, 0x38, 0x0d, 0xbe, 0x04, 0x7a, 0xc1, 0x5e, 0x1f, 0xed, 0xcf, 0xd6, 0x4b, - 0x5d, 0x0f, 0x40, 0xf6, 0xea, 0xc5, 0x6a, 0x1d, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x34, 0x09, - 0x59, 0x09, 0xcd, 0x03, 0x00, 0x00, + 0x4a, 0x68, 0x09, 0x83, 0x1d, 0x10, 0x37, 0xb2, 0x03, 0xea, 0x6d, 0xf2, 0x6e, 0x48, 0x68, 0x4a, + 0x9d, 0x6f, 0x99, 0x95, 0x26, 0xee, 0x6a, 0xaf, 0xb0, 0x5f, 0x01, 0x3f, 0x6b, 0xc7, 0x1d, 0x39, + 0x45, 0xa8, 0xfd, 0x03, 0xa8, 0x47, 0x4e, 0xc8, 0x89, 0x9b, 0xb5, 0x5a, 0x84, 0x60, 0xa7, 0xc4, + 0x7e, 0xdf, 0xef, 0x79, 0x7c, 0xf9, 0xd0, 0x73, 0x36, 0xa0, 0x1e, 0xe5, 0x63, 0xf0, 0xe8, 0x79, + 0x90, 0xa6, 0x30, 0xf4, 0x26, 0x07, 0x5e, 0x04, 0x29, 0x08, 0x26, 0xdc, 0xd1, 0x98, 0x4b, 0x8e, + 0x77, 0xd8, 0x80, 0xba, 0xaa, 0xe2, 0xea, 0x8a, 0x3b, 0x39, 0xe8, 0xec, 0x46, 0x3c, 0xe2, 0x79, + 0xee, 0xa9, 0xbf, 0xa2, 0xda, 0xa9, 0xa4, 0x2d, 0xa6, 0xf2, 0x8a, 0xf3, 0xab, 0x81, 0xb6, 0x3e, + 0x16, 0xfc, 0x13, 0x19, 0x48, 0xc0, 0x9f, 0xd1, 0xba, 0x6e, 0x08, 0xd3, 0xe8, 0xd6, 0x7b, 0x9b, + 0x6f, 0x5e, 0xba, 0x15, 0x46, 0xb7, 0x1f, 0x42, 0x2a, 0xd9, 0x19, 0x83, 0xf0, 0xa8, 0xb8, 0xf4, + 0x1f, 0x5f, 0x67, 0x76, 0xed, 0x77, 0x66, 0x6f, 0xdf, 0x89, 0x48, 0x89, 0xc4, 0x17, 0xe8, 0x51, + 0x40, 0xe3, 0x94, 0x7f, 0x19, 0x42, 0x18, 0x41, 0x02, 0xa9, 0x14, 0xe6, 0x5a, 0xae, 0xe9, 0x55, + 0x6a, 0x8e, 0x03, 0x1a, 0x83, 0xfc, 0x40, 0xe3, 0x23, 0x9e, 0x24, 0x4c, 0xaa, 0x01, 0xff, 0x89, + 0x16, 0xed, 0x54, 0x84, 0xe4, 0x0e, 0x1e, 0x1f, 0xa3, 0x4d, 0x5a, 0xe6, 0xc2, 0xac, 0xff, 0xa7, + 0xad, 0xa1, 0x6c, 0x64, 0x19, 0x81, 0x19, 0x6a, 0x0b, 0x48, 0xc3, 0x53, 0x01, 0x17, 0x97, 0x90, + 0x52, 0x10, 0x66, 0x23, 0x87, 0xbe, 0xf8, 0x0b, 0xf4, 0x44, 0x77, 0xfd, 0x67, 0x8a, 0x37, 0xcf, + 0xec, 0xbd, 0xab, 0x20, 0x19, 0xbe, 0x77, 0x56, 0x41, 0x0e, 0x69, 0xa9, 0x8b, 0x45, 0x39, 0x57, + 0x8d, 0x81, 0x4e, 0x96, 0x54, 0x0f, 0xee, 0xad, 0x5a, 0x05, 0x39, 0xa4, 0xa5, 0x2e, 0x6e, 0x55, + 0x67, 0xa8, 0x15, 0xd0, 0x78, 0xc9, 0xd4, 0xfc, 0x77, 0xd3, 0x53, 0x6d, 0xda, 0x2d, 0x4c, 0x2b, + 0x1c, 0x87, 0x6c, 0x05, 0x34, 0x2e, 0x3d, 0xce, 0x37, 0x03, 0xb5, 0x57, 0xc7, 0xf1, 0x2b, 0xf4, + 0x70, 0xc4, 0xc7, 0xf2, 0x94, 0x85, 0xa6, 0xd1, 0x35, 0x7a, 0x1b, 0x3e, 0x9e, 0x67, 0x76, 0xbb, + 0x60, 0xe9, 0xc0, 0x21, 0x4d, 0xf5, 0xd7, 0x0f, 0xf1, 0x21, 0x42, 0xfa, 0x21, 0xaa, 0xbf, 0x96, + 0xf7, 0xf7, 0xe6, 0x99, 0xbd, 0x5d, 0xf4, 0x6f, 0x33, 0x87, 0x6c, 0xe8, 0x43, 0x3f, 0xc4, 0x1d, + 0xb4, 0xbe, 0x78, 0x91, 0x59, 0xef, 0x1a, 0xbd, 0x06, 0x29, 0xcf, 0x3e, 0xb9, 0x9e, 0x5a, 0xc6, + 0xcd, 0xd4, 0x32, 0x7e, 0x4e, 0x2d, 0xe3, 0xfb, 0xcc, 0xaa, 0xdd, 0xcc, 0xac, 0xda, 0x8f, 0x99, + 0x55, 0xfb, 0xf4, 0x2e, 0x62, 0xf2, 0xfc, 0x72, 0xe0, 0x52, 0x9e, 0x78, 0x94, 0x8b, 0x84, 0x0b, + 0xfd, 0xd9, 0x17, 0x61, 0xec, 0x7d, 0xf5, 0xca, 0x05, 0x7b, 0x7d, 0xb8, 0xbf, 0xd8, 0x31, 0x79, + 0x35, 0x02, 0x31, 0x68, 0xe6, 0xfb, 0xf5, 0xf6, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x0a, + 0xe5, 0x3b, 0xd2, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/04-channel/types/genesis_test.go b/x/ibc/core/04-channel/types/genesis_test.go similarity index 98% rename from x/ibc/04-channel/types/genesis_test.go rename to x/ibc/core/04-channel/types/genesis_test.go index 28e5cf67b1..8110a50614 100644 --- a/x/ibc/04-channel/types/genesis_test.go +++ b/x/ibc/core/04-channel/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) const ( diff --git a/x/ibc/04-channel/types/keys.go b/x/ibc/core/04-channel/types/keys.go similarity index 100% rename from x/ibc/04-channel/types/keys.go rename to x/ibc/core/04-channel/types/keys.go diff --git a/x/ibc/04-channel/types/msgs.go b/x/ibc/core/04-channel/types/msgs.go similarity index 98% rename from x/ibc/04-channel/types/msgs.go rename to x/ibc/core/04-channel/types/msgs.go index cc98565f32..1cfc318206 100644 --- a/x/ibc/04-channel/types/msgs.go +++ b/x/ibc/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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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" ) var _ sdk.Msg = &MsgChannelOpenInit{} diff --git a/x/ibc/04-channel/types/msgs_test.go b/x/ibc/core/04-channel/types/msgs_test.go similarity index 98% rename from x/ibc/04-channel/types/msgs_test.go rename to x/ibc/core/04-channel/types/msgs_test.go index 8421a77bcd..39f0499ab3 100644 --- a/x/ibc/04-channel/types/msgs_test.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // define constants used for testing diff --git a/x/ibc/04-channel/types/packet.go b/x/ibc/core/04-channel/types/packet.go similarity index 95% rename from x/ibc/04-channel/types/packet.go rename to x/ibc/core/04-channel/types/packet.go index 517d00195c..976cbdf5b1 100644 --- a/x/ibc/04-channel/types/packet.go +++ b/x/ibc/core/04-channel/types/packet.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/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // CommitPacket returns a packet commitment bytes. The commitment consists of: diff --git a/x/ibc/04-channel/types/packet_test.go b/x/ibc/core/04-channel/types/packet_test.go similarity index 96% rename from x/ibc/04-channel/types/packet_test.go rename to x/ibc/core/04-channel/types/packet_test.go index c027290ecd..114352f5c9 100644 --- a/x/ibc/04-channel/types/packet_test.go +++ b/x/ibc/core/04-channel/types/packet_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) func TestPacketValidateBasic(t *testing.T) { diff --git a/x/ibc/04-channel/types/query.go b/x/ibc/core/04-channel/types/query.go similarity index 93% rename from x/ibc/04-channel/types/query.go rename to x/ibc/core/04-channel/types/query.go index 01e9d7bc79..91bf2ed823 100644 --- a/x/ibc/04-channel/types/query.go +++ b/x/ibc/core/04-channel/types/query.go @@ -4,10 +4,10 @@ import ( "strings" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // NewQueryChannelResponse creates a new QueryChannelResponse instance diff --git a/x/ibc/04-channel/types/query.pb.go b/x/ibc/core/04-channel/types/query.pb.go similarity index 95% rename from x/ibc/04-channel/types/query.pb.go rename to x/ibc/core/04-channel/types/query.pb.go index fe6d7cb142..8bb272f255 100644 --- a/x/ibc/04-channel/types/query.pb.go +++ b/x/ibc/core/04-channel/types/query.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" types1 "github.com/cosmos/cosmos-sdk/codec/types" query "github.com/cosmos/cosmos-sdk/types/query" - types "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + types "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" @@ -1489,93 +1489,94 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/query.proto", fileDescriptor_1034a1e9abc4cca1) } var fileDescriptor_1034a1e9abc4cca1 = []byte{ - // 1375 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x41, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0xd8, 0x6e, 0x9b, 0xbc, 0xa4, 0x2d, 0x9d, 0x24, 0x6a, 0xb2, 0x4d, 0x9c, 0x74, 0xa5, - 0x42, 0x5a, 0xa9, 0x3b, 0x38, 0x29, 0xa1, 0x42, 0x50, 0x29, 0x89, 0x44, 0x9b, 0x4a, 0x69, 0x53, - 0x47, 0x95, 0xda, 0x1e, 0x30, 0xeb, 0xf5, 0xc4, 0x5e, 0x25, 0xde, 0x75, 0xbd, 0x6b, 0x37, 0x21, - 0x18, 0xa1, 0x22, 0x41, 0x4f, 0x08, 0xa9, 0x07, 0x8e, 0x48, 0xdc, 0xf8, 0x09, 0x9c, 0xb8, 0xe6, - 0x46, 0xa4, 0x72, 0x40, 0x42, 0xaa, 0x50, 0xc2, 0x81, 0x1b, 0x27, 0x2e, 0x1c, 0x10, 0xda, 0x99, - 0xd9, 0xf5, 0xae, 0xbd, 0xbb, 0x89, 0xe3, 0x94, 0x20, 0x4e, 0xf5, 0xbe, 0x79, 0xef, 0xcd, 0xf7, - 0x7d, 0xef, 0xed, 0xec, 0x9b, 0x06, 0x26, 0xf4, 0xbc, 0x46, 0x34, 0xb3, 0x4a, 0x89, 0x56, 0x52, - 0x0d, 0x83, 0xae, 0x93, 0x7a, 0x86, 0x3c, 0xae, 0xd1, 0xea, 0xa6, 0x52, 0xa9, 0x9a, 0xb6, 0x89, - 0x07, 0xf5, 0xbc, 0xa6, 0x38, 0x0e, 0x8a, 0x70, 0x50, 0xea, 0x19, 0xc9, 0x17, 0xb5, 0xae, 0x53, - 0xc3, 0x76, 0x82, 0xf8, 0x2f, 0x1e, 0x25, 0x5d, 0xd1, 0x4c, 0xab, 0x6c, 0x5a, 0x24, 0xaf, 0x5a, - 0x94, 0xa7, 0x23, 0xf5, 0x4c, 0x9e, 0xda, 0x6a, 0x86, 0x54, 0xd4, 0xa2, 0x6e, 0xa8, 0xb6, 0x6e, - 0x1a, 0xc2, 0xf7, 0x62, 0x18, 0x04, 0x77, 0x33, 0xee, 0x32, 0x56, 0x34, 0xcd, 0xe2, 0x3a, 0x25, - 0x6a, 0x45, 0x27, 0xaa, 0x61, 0x98, 0x36, 0x8b, 0xb7, 0xc4, 0xea, 0xa8, 0x58, 0x65, 0x4f, 0xf9, - 0xda, 0x2a, 0x51, 0x0d, 0x81, 0x5e, 0x1a, 0x2a, 0x9a, 0x45, 0x93, 0xfd, 0x24, 0xce, 0x2f, 0x6e, - 0x95, 0x97, 0x60, 0xf0, 0x9e, 0x83, 0x69, 0x81, 0x6f, 0x92, 0xa5, 0x8f, 0x6b, 0xd4, 0xb2, 0xf1, - 0x79, 0x38, 0x55, 0x31, 0xab, 0x76, 0x4e, 0x2f, 0x8c, 0xa0, 0x49, 0x34, 0xd5, 0x97, 0x3d, 0xe9, - 0x3c, 0x2e, 0x16, 0xf0, 0x38, 0x80, 0xc0, 0xe3, 0xac, 0x25, 0xd8, 0x5a, 0x9f, 0xb0, 0x2c, 0x16, - 0xe4, 0x6d, 0x04, 0x43, 0xc1, 0x7c, 0x56, 0xc5, 0x34, 0x2c, 0x8a, 0x67, 0xe1, 0x94, 0xf0, 0x62, - 0x09, 0xfb, 0xa7, 0xc7, 0x94, 0x10, 0x35, 0x15, 0x37, 0xcc, 0x75, 0xc6, 0x43, 0x70, 0xa2, 0x52, - 0x35, 0xcd, 0x55, 0xb6, 0xd5, 0x40, 0x96, 0x3f, 0x38, 0x28, 0xd8, 0x8f, 0x5c, 0x45, 0xb5, 0x4b, - 0x23, 0x49, 0x8e, 0x82, 0x59, 0x96, 0x55, 0xbb, 0x84, 0x17, 0x60, 0x80, 0x2f, 0x97, 0xa8, 0x5e, - 0x2c, 0xd9, 0x23, 0x29, 0xb6, 0xa3, 0xe4, 0xdb, 0x91, 0x17, 0xa8, 0x9e, 0x51, 0x6e, 0x31, 0x8f, - 0xf9, 0xd4, 0xf6, 0xcb, 0x89, 0x9e, 0x6c, 0x3f, 0x8b, 0xe2, 0x26, 0xf9, 0x83, 0x20, 0x13, 0xcb, - 0x95, 0xe6, 0x7d, 0x80, 0x66, 0xdd, 0x04, 0x99, 0xd7, 0x15, 0x5e, 0x64, 0xc5, 0x29, 0xb2, 0xc2, - 0x7b, 0x46, 0x14, 0x59, 0x59, 0x56, 0x8b, 0x54, 0xc4, 0x66, 0x7d, 0x91, 0xf2, 0x4b, 0x04, 0xc3, - 0x2d, 0x1b, 0x08, 0xad, 0xe6, 0xa1, 0x57, 0xd0, 0xb7, 0x46, 0xd0, 0x64, 0x92, 0xe5, 0x0f, 0x13, - 0x6b, 0xb1, 0x40, 0x0d, 0x5b, 0x5f, 0xd5, 0x69, 0xc1, 0x95, 0xcd, 0x8b, 0xc3, 0x37, 0x03, 0x28, - 0x13, 0x0c, 0xe5, 0x1b, 0xfb, 0xa2, 0xe4, 0x00, 0xfc, 0x30, 0xf1, 0x75, 0x38, 0x29, 0x54, 0x4c, - 0x1e, 0x50, 0x45, 0xe1, 0x2f, 0x3f, 0x43, 0x90, 0xe6, 0x04, 0x4d, 0xc3, 0xa0, 0x9a, 0x93, 0xad, - 0x55, 0xcb, 0x34, 0x80, 0xe6, 0x2d, 0x8a, 0x4e, 0xf3, 0x59, 0x5a, 0xb4, 0x4e, 0x1c, 0x5a, 0xeb, - 0xdf, 0x11, 0x4c, 0x44, 0x42, 0xf9, 0x7f, 0xa9, 0xfe, 0xc0, 0x15, 0x9d, 0x63, 0x5a, 0x60, 0xde, - 0x2b, 0xb6, 0x6a, 0xd3, 0x6e, 0xdf, 0xed, 0xbf, 0x3d, 0x11, 0x43, 0x52, 0x0b, 0x11, 0x55, 0x38, - 0xaf, 0x7b, 0xfa, 0xe4, 0x38, 0xd4, 0x9c, 0xe5, 0xb8, 0x88, 0x37, 0xe5, 0x72, 0x18, 0x11, 0x9f, - 0xa4, 0xbe, 0x9c, 0xc3, 0x7a, 0x98, 0xf9, 0x18, 0x4f, 0x84, 0xef, 0x10, 0x5c, 0x0c, 0x08, 0xe0, - 0x50, 0x36, 0xac, 0x9a, 0x75, 0x14, 0xf2, 0xe2, 0x4b, 0x70, 0xa6, 0x4e, 0xab, 0x96, 0x6e, 0x1a, - 0x39, 0xa3, 0x56, 0xce, 0xd3, 0x2a, 0x63, 0x91, 0xca, 0x9e, 0x16, 0xd6, 0x3b, 0xcc, 0xe8, 0x77, - 0xf3, 0x71, 0x69, 0xba, 0x09, 0xac, 0x7f, 0x21, 0x90, 0xe3, 0xb0, 0x8a, 0x7a, 0xbd, 0x07, 0x67, - 0x35, 0x77, 0x25, 0x50, 0xa7, 0x21, 0x85, 0x7f, 0x49, 0x14, 0xf7, 0x4b, 0xa2, 0xcc, 0x19, 0x9b, - 0xd9, 0x33, 0x5a, 0x20, 0x0d, 0xbe, 0x00, 0x7d, 0xa2, 0xc6, 0x1e, 0xa3, 0x5e, 0x6e, 0x58, 0x2c, - 0x34, 0x0b, 0x95, 0x8c, 0x2e, 0x54, 0x6a, 0xbf, 0x42, 0x9d, 0x38, 0x4c, 0xa1, 0xaa, 0x30, 0xc6, - 0xb8, 0x2f, 0xab, 0xda, 0x1a, 0xb5, 0x17, 0xcc, 0x72, 0x59, 0xb7, 0xcb, 0xd4, 0xb0, 0xbb, 0x2d, - 0x91, 0x04, 0xbd, 0x96, 0x93, 0xc2, 0xd0, 0xa8, 0x28, 0x8e, 0xf7, 0x2c, 0x7f, 0x8f, 0x60, 0x3c, - 0x62, 0x53, 0xa1, 0x35, 0x3b, 0xec, 0x5c, 0x2b, 0xdb, 0x78, 0x20, 0xeb, 0xb3, 0x1c, 0x63, 0x63, - 0x7f, 0x13, 0x85, 0xdd, 0xea, 0x56, 0xb1, 0xe0, 0x01, 0x9e, 0x3c, 0xf4, 0x01, 0xfe, 0x87, 0xfb, - 0x2d, 0x09, 0x41, 0x28, 0xe4, 0xbd, 0x0d, 0xfd, 0x4d, 0x31, 0xdd, 0x23, 0x7c, 0x2a, 0xf4, 0x08, - 0xe7, 0x49, 0xe6, 0xb4, 0x35, 0x5f, 0x95, 0xfc, 0xc1, 0xff, 0x85, 0x73, 0xfc, 0x89, 0x38, 0x6b, - 0x3c, 0xac, 0x86, 0xf9, 0x64, 0x9d, 0x16, 0x8a, 0xf4, 0x55, 0x37, 0xf2, 0xb6, 0x7b, 0x72, 0x44, - 0xec, 0x2c, 0xe4, 0x9e, 0x82, 0xb3, 0x6a, 0x70, 0x49, 0xb4, 0x74, 0xab, 0xf9, 0x18, 0xfb, 0xfa, - 0x6b, 0xb7, 0xaf, 0xef, 0x1b, 0x55, 0xaa, 0x51, 0xbd, 0x4e, 0x0b, 0x9c, 0x54, 0xd7, 0x7d, 0x7d, - 0x03, 0x2e, 0x54, 0x58, 0xa6, 0x5c, 0xb3, 0x6d, 0x72, 0xae, 0x84, 0xd6, 0x48, 0x72, 0x32, 0x39, - 0x95, 0xca, 0x8e, 0x56, 0x5a, 0x9a, 0x75, 0xc5, 0x75, 0x90, 0x37, 0x44, 0x3b, 0x87, 0x00, 0x13, - 0xfa, 0x8e, 0x41, 0x5f, 0x33, 0x1f, 0x62, 0xf9, 0x9a, 0x06, 0x5f, 0x5f, 0x25, 0x3a, 0xec, 0xab, - 0xe7, 0x08, 0x46, 0xbd, 0xad, 0xd7, 0xd5, 0x4d, 0x5a, 0x98, 0xd3, 0xd6, 0x8e, 0x5d, 0x0f, 0x1b, - 0xa4, 0x30, 0x50, 0xaf, 0x58, 0x8b, 0x87, 0x62, 0xa0, 0xb9, 0x43, 0x37, 0x3c, 0x2c, 0x59, 0x5e, - 0x8f, 0x6e, 0x87, 0xa5, 0x1d, 0x04, 0x93, 0xd1, 0xb9, 0x05, 0xaf, 0x69, 0x18, 0x36, 0xe8, 0x46, - 0x53, 0xa8, 0x9c, 0x68, 0x06, 0xb6, 0x55, 0x2a, 0x3b, 0x68, 0xb4, 0xc7, 0x1e, 0xdf, 0xdb, 0x34, - 0xfd, 0x23, 0x86, 0x13, 0x8c, 0x12, 0xfe, 0x16, 0xc1, 0x29, 0x31, 0x57, 0xe0, 0xf0, 0x13, 0x36, - 0xe4, 0x4e, 0x29, 0x5d, 0x3e, 0x80, 0x27, 0x17, 0x46, 0x9e, 0x7f, 0xfa, 0xe2, 0xb7, 0xe7, 0x89, - 0x77, 0xf1, 0x3b, 0x84, 0x5d, 0x88, 0xbd, 0xbb, 0x30, 0xbf, 0x36, 0xbb, 0xe3, 0x36, 0xd9, 0x6a, - 0x56, 0xa0, 0x41, 0x9c, 0xba, 0x58, 0x64, 0x4b, 0x54, 0xab, 0x81, 0x9f, 0x21, 0xe8, 0x75, 0x87, - 0x7c, 0xbc, 0xff, 0xde, 0xee, 0x2b, 0x20, 0x5d, 0x39, 0x88, 0xab, 0xc0, 0x79, 0x89, 0xe1, 0x9c, - 0xc0, 0xe3, 0xb1, 0x38, 0xf1, 0x0f, 0x08, 0x70, 0xfb, 0xcd, 0x03, 0xcf, 0xc4, 0xec, 0x14, 0x75, - 0x65, 0x92, 0xae, 0x75, 0x16, 0x24, 0x80, 0xde, 0x60, 0x40, 0xaf, 0xe3, 0xd9, 0x70, 0xa0, 0x5e, - 0xa0, 0xa3, 0xa9, 0xf7, 0xd0, 0x68, 0x32, 0xd8, 0x71, 0x18, 0xb4, 0x8d, 0xfd, 0xb1, 0x0c, 0xa2, - 0xee, 0x1f, 0xb1, 0x0c, 0x22, 0x6f, 0x16, 0xf2, 0x5d, 0xc6, 0x60, 0x11, 0xdf, 0x3c, 0x7c, 0x4b, - 0x10, 0xff, 0x7d, 0x04, 0x7f, 0x99, 0x80, 0xe1, 0xd0, 0xe1, 0x18, 0xcf, 0xee, 0x0f, 0x30, 0x6c, - 0xf2, 0x97, 0xde, 0xee, 0x38, 0x4e, 0x70, 0xfb, 0x0c, 0x31, 0x72, 0x0d, 0xbc, 0xd5, 0x0d, 0xb9, - 0xe0, 0x1c, 0x4f, 0xc4, 0x7d, 0x80, 0x6c, 0x05, 0x6f, 0x15, 0x0d, 0xc2, 0xcf, 0x80, 0xa6, 0x9d, - 0x3f, 0x37, 0xf0, 0x2f, 0x08, 0x5e, 0x6b, 0x1d, 0xaf, 0x70, 0x26, 0x9a, 0x53, 0xc4, 0x74, 0x2d, - 0x4d, 0x77, 0x12, 0x22, 0x14, 0xf8, 0x90, 0x09, 0xf0, 0x08, 0x3f, 0xe8, 0x42, 0x80, 0xb6, 0x0f, - 0x90, 0x45, 0xb6, 0xdc, 0x93, 0xb5, 0x81, 0x5f, 0x20, 0x38, 0xd7, 0x36, 0x3c, 0xe2, 0x0e, 0xb0, - 0x7a, 0x6f, 0xe0, 0x4c, 0x47, 0x31, 0x82, 0xe0, 0x7d, 0x46, 0xf0, 0x2e, 0x5e, 0x3a, 0x52, 0x82, - 0x78, 0x0f, 0xc1, 0x70, 0xe8, 0x9c, 0x16, 0xd7, 0xc4, 0x71, 0x23, 0x65, 0x5c, 0x13, 0xc7, 0x0e, - 0x84, 0xf2, 0x43, 0xc6, 0x70, 0x05, 0xdf, 0xeb, 0x9e, 0xa1, 0xaa, 0xad, 0x05, 0x6a, 0xf7, 0x79, - 0x02, 0xce, 0xb5, 0x4d, 0x4a, 0x71, 0xb5, 0x8b, 0x9a, 0xf7, 0xe2, 0x6a, 0x17, 0x39, 0x8a, 0xc9, - 0x5f, 0xf0, 0xd7, 0xf3, 0x53, 0x84, 0x3f, 0x39, 0xe2, 0xf6, 0x8c, 0x99, 0x99, 0x1a, 0xa4, 0xe6, - 0x01, 0xca, 0x55, 0x04, 0xe5, 0x3f, 0x11, 0x9c, 0x0e, 0x8c, 0x48, 0x58, 0x89, 0x27, 0xd4, 0x3a, - 0xe0, 0x49, 0xe4, 0xc0, 0xfe, 0x82, 0xfc, 0x53, 0x4e, 0xfe, 0x63, 0xfc, 0xd1, 0xbf, 0xcd, 0x9d, - 0x61, 0x61, 0xbd, 0x80, 0x7f, 0x42, 0x30, 0x18, 0x32, 0x48, 0xe1, 0x98, 0x4f, 0x49, 0xf4, 0x4c, - 0x27, 0xbd, 0xd5, 0x61, 0x94, 0x50, 0x62, 0x99, 0x09, 0x71, 0x1b, 0xdf, 0xea, 0x42, 0x88, 0xc0, - 0xb8, 0x37, 0xbf, 0xb4, 0xbd, 0x9b, 0x46, 0x3b, 0xbb, 0x69, 0xf4, 0xeb, 0x6e, 0x1a, 0x7d, 0xb5, - 0x97, 0xee, 0xd9, 0xd9, 0x4b, 0xf7, 0xfc, 0xbc, 0x97, 0xee, 0x79, 0x34, 0x53, 0xd4, 0xed, 0x52, - 0x2d, 0xaf, 0x68, 0x66, 0x99, 0x88, 0xbf, 0x1f, 0xf0, 0x7f, 0xae, 0x5a, 0x85, 0x35, 0xb2, 0xc1, - 0x10, 0xbc, 0x79, 0xed, 0xaa, 0x0b, 0xc2, 0xde, 0xac, 0x50, 0x2b, 0x7f, 0x92, 0xfd, 0x5f, 0xcd, - 0xcc, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x27, 0xc6, 0x5e, 0x7f, 0xc9, 0x18, 0x00, 0x00, + // 1377 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xce, 0xd8, 0x6e, 0x9b, 0xbc, 0xfe, 0xa2, 0x93, 0x44, 0x4d, 0xb7, 0xa9, 0x93, 0xae, 0x54, + 0x48, 0x2b, 0x75, 0x07, 0x27, 0x25, 0x44, 0x08, 0x2a, 0x25, 0x91, 0x68, 0x53, 0xa9, 0x6d, 0xba, + 0x51, 0xa5, 0xb6, 0x07, 0xcc, 0x7a, 0x3d, 0xb1, 0x57, 0x89, 0x77, 0x5d, 0xef, 0xda, 0x4d, 0x08, + 0x46, 0xa8, 0x48, 0xd0, 0x13, 0x42, 0xea, 0x81, 0x23, 0x12, 0x37, 0xfe, 0x04, 0x4e, 0x5c, 0x73, + 0x23, 0x52, 0x39, 0x20, 0x21, 0x55, 0x28, 0xe1, 0xc0, 0x8d, 0x13, 0x17, 0x0e, 0x08, 0xed, 0xcc, + 0xec, 0x7a, 0xd7, 0xde, 0xdd, 0xc4, 0x71, 0x4a, 0x10, 0xa7, 0x7a, 0xdf, 0xbc, 0xf7, 0xe6, 0xfb, + 0xbe, 0xf7, 0x76, 0xf6, 0x4d, 0x03, 0x63, 0x46, 0x41, 0x27, 0xba, 0x55, 0xa3, 0x44, 0x2f, 0x6b, + 0xa6, 0x49, 0x57, 0x49, 0x23, 0x47, 0x1e, 0xd7, 0x69, 0x6d, 0x5d, 0xa9, 0xd6, 0x2c, 0xc7, 0xc2, + 0x83, 0x46, 0x41, 0x57, 0x5c, 0x07, 0x45, 0x38, 0x28, 0x8d, 0x9c, 0x14, 0x88, 0x5a, 0x35, 0xa8, + 0xe9, 0xb8, 0x41, 0xfc, 0x17, 0x8f, 0x92, 0xae, 0xe8, 0x96, 0x5d, 0xb1, 0x6c, 0x52, 0xd0, 0x6c, + 0xca, 0xd3, 0x91, 0x46, 0xae, 0x40, 0x1d, 0x2d, 0x47, 0xaa, 0x5a, 0xc9, 0x30, 0x35, 0xc7, 0xb0, + 0x4c, 0xe1, 0x7b, 0x31, 0x0a, 0x82, 0xb7, 0x19, 0x77, 0x19, 0x2d, 0x59, 0x56, 0x69, 0x95, 0x12, + 0xad, 0x6a, 0x10, 0xcd, 0x34, 0x2d, 0x87, 0xc5, 0xdb, 0x62, 0xf5, 0x9c, 0x58, 0x65, 0x4f, 0x85, + 0xfa, 0x32, 0xd1, 0x4c, 0x81, 0x5e, 0x1a, 0x2a, 0x59, 0x25, 0x8b, 0xfd, 0x24, 0xee, 0x2f, 0x6e, + 0x95, 0x6f, 0xc3, 0xe0, 0x3d, 0x17, 0xd3, 0x3c, 0xdf, 0x44, 0xa5, 0x8f, 0xeb, 0xd4, 0x76, 0xf0, + 0x59, 0x38, 0x56, 0xb5, 0x6a, 0x4e, 0xde, 0x28, 0x8e, 0xa0, 0x71, 0x34, 0x31, 0xa0, 0x1e, 0x75, + 0x1f, 0x17, 0x8a, 0xf8, 0x02, 0x80, 0xc0, 0xe3, 0xae, 0xa5, 0xd8, 0xda, 0x80, 0xb0, 0x2c, 0x14, + 0xe5, 0x4d, 0x04, 0x43, 0xe1, 0x7c, 0x76, 0xd5, 0x32, 0x6d, 0x8a, 0xa7, 0xe1, 0x98, 0xf0, 0x62, + 0x09, 0x8f, 0x4f, 0x8e, 0x2a, 0x11, 0x6a, 0x2a, 0x5e, 0x98, 0xe7, 0x8c, 0x87, 0xe0, 0x48, 0xb5, + 0x66, 0x59, 0xcb, 0x6c, 0xab, 0x13, 0x2a, 0x7f, 0x70, 0x51, 0xb0, 0x1f, 0xf9, 0xaa, 0xe6, 0x94, + 0x47, 0xd2, 0x1c, 0x05, 0xb3, 0x2c, 0x6a, 0x4e, 0x19, 0xcf, 0xc3, 0x09, 0xbe, 0x5c, 0xa6, 0x46, + 0xa9, 0xec, 0x8c, 0x64, 0xd8, 0x8e, 0x52, 0x60, 0x47, 0x5e, 0xa0, 0x46, 0x4e, 0xb9, 0xc9, 0x3c, + 0xe6, 0x32, 0x9b, 0x2f, 0xc7, 0xfa, 0xd4, 0xe3, 0x2c, 0x8a, 0x9b, 0xe4, 0x0f, 0xc2, 0x4c, 0x6c, + 0x4f, 0x9a, 0xf7, 0x01, 0x5a, 0x75, 0x13, 0x64, 0x5e, 0x57, 0x78, 0x91, 0x15, 0xb7, 0xc8, 0x0a, + 0xef, 0x19, 0x51, 0x64, 0x65, 0x51, 0x2b, 0x51, 0x11, 0xab, 0x06, 0x22, 0xe5, 0x97, 0x08, 0x86, + 0xdb, 0x36, 0x10, 0x5a, 0xcd, 0x41, 0xbf, 0xa0, 0x6f, 0x8f, 0xa0, 0xf1, 0x34, 0xcb, 0x1f, 0x25, + 0xd6, 0x42, 0x91, 0x9a, 0x8e, 0xb1, 0x6c, 0xd0, 0xa2, 0x27, 0x9b, 0x1f, 0x87, 0x6f, 0x84, 0x50, + 0xa6, 0x18, 0xca, 0x37, 0x76, 0x45, 0xc9, 0x01, 0x04, 0x61, 0xe2, 0x19, 0x38, 0x2a, 0x54, 0x4c, + 0xef, 0x51, 0x45, 0xe1, 0x2f, 0x3f, 0x43, 0x90, 0xe5, 0x04, 0x2d, 0xd3, 0xa4, 0xba, 0x9b, 0xad, + 0x5d, 0xcb, 0x2c, 0x80, 0xee, 0x2f, 0x8a, 0x4e, 0x0b, 0x58, 0xda, 0xb4, 0x4e, 0xed, 0x5b, 0xeb, + 0xdf, 0x11, 0x8c, 0xc5, 0x42, 0xf9, 0x7f, 0xa9, 0xfe, 0xc0, 0x13, 0x9d, 0x63, 0x9a, 0x67, 0xde, + 0x4b, 0x8e, 0xe6, 0xd0, 0x5e, 0xdf, 0xed, 0xbf, 0x7d, 0x11, 0x23, 0x52, 0x0b, 0x11, 0x35, 0x38, + 0x6b, 0xf8, 0xfa, 0xe4, 0x39, 0xd4, 0xbc, 0xed, 0xba, 0x88, 0x37, 0xe5, 0x72, 0x14, 0x91, 0x80, + 0xa4, 0x81, 0x9c, 0xc3, 0x46, 0x94, 0xf9, 0x10, 0x4f, 0x84, 0xef, 0x10, 0x5c, 0x0c, 0x09, 0xe0, + 0x52, 0x36, 0xed, 0xba, 0x7d, 0x10, 0xf2, 0xe2, 0x4b, 0x70, 0xaa, 0x41, 0x6b, 0xb6, 0x61, 0x99, + 0x79, 0xb3, 0x5e, 0x29, 0xd0, 0x1a, 0x63, 0x91, 0x51, 0x4f, 0x0a, 0xeb, 0x1d, 0x66, 0x0c, 0xba, + 0x05, 0xb8, 0xb4, 0xdc, 0x04, 0xd6, 0xbf, 0x10, 0xc8, 0x49, 0x58, 0x45, 0xbd, 0xde, 0x83, 0xd3, + 0xba, 0xb7, 0x12, 0xaa, 0xd3, 0x90, 0xc2, 0xbf, 0x24, 0x8a, 0xf7, 0x25, 0x51, 0x66, 0xcd, 0x75, + 0xf5, 0x94, 0x1e, 0x4a, 0x83, 0xcf, 0xc3, 0x80, 0xa8, 0xb1, 0xcf, 0xa8, 0x9f, 0x1b, 0x16, 0x8a, + 0xad, 0x42, 0xa5, 0xe3, 0x0b, 0x95, 0xd9, 0xad, 0x50, 0x47, 0xf6, 0x53, 0xa8, 0x1a, 0x8c, 0x32, + 0xee, 0x8b, 0x9a, 0xbe, 0x42, 0x9d, 0x79, 0xab, 0x52, 0x31, 0x9c, 0x0a, 0x35, 0x9d, 0x5e, 0x4b, + 0x24, 0x41, 0xbf, 0xed, 0xa6, 0x30, 0x75, 0x2a, 0x8a, 0xe3, 0x3f, 0xcb, 0xdf, 0x23, 0xb8, 0x10, + 0xb3, 0xa9, 0xd0, 0x9a, 0x1d, 0x76, 0x9e, 0x95, 0x6d, 0x7c, 0x42, 0x0d, 0x58, 0x0e, 0xb1, 0xb1, + 0xbf, 0x89, 0xc3, 0x6e, 0xf7, 0xaa, 0x58, 0xf8, 0x00, 0x4f, 0xef, 0xfb, 0x00, 0xff, 0xc3, 0xfb, + 0x96, 0x44, 0x20, 0x14, 0xf2, 0xde, 0x82, 0xe3, 0x2d, 0x31, 0xbd, 0x23, 0x7c, 0x22, 0xf2, 0x08, + 0xe7, 0x49, 0x66, 0xf5, 0x95, 0x40, 0x95, 0x82, 0xc1, 0xff, 0x85, 0x73, 0xfc, 0x89, 0x38, 0x6b, + 0x7c, 0xac, 0xa6, 0xf5, 0x64, 0x95, 0x16, 0x4b, 0xf4, 0x55, 0x37, 0xf2, 0xa6, 0x77, 0x72, 0xc4, + 0xec, 0x2c, 0xe4, 0x9e, 0x80, 0xd3, 0x5a, 0x78, 0x49, 0xb4, 0x74, 0xbb, 0xf9, 0x10, 0xfb, 0xfa, + 0x6b, 0xaf, 0xaf, 0xef, 0x9b, 0x35, 0xaa, 0x53, 0xa3, 0x41, 0x8b, 0x9c, 0x54, 0xcf, 0x7d, 0x7d, + 0x1d, 0xce, 0x57, 0x59, 0xa6, 0x7c, 0xab, 0x6d, 0xf2, 0x9e, 0x84, 0xf6, 0x48, 0x7a, 0x3c, 0x3d, + 0x91, 0x51, 0xcf, 0x55, 0xdb, 0x9a, 0x75, 0xc9, 0x73, 0x90, 0xd7, 0x44, 0x3b, 0x47, 0x00, 0x13, + 0xfa, 0x8e, 0xc2, 0x40, 0x2b, 0x1f, 0x62, 0xf9, 0x5a, 0x86, 0x40, 0x5f, 0xa5, 0xba, 0xec, 0xab, + 0xe7, 0x08, 0xce, 0xf9, 0x5b, 0xaf, 0x6a, 0xeb, 0xb4, 0x38, 0xab, 0xaf, 0x1c, 0xba, 0x1e, 0x0e, + 0x48, 0x51, 0xa0, 0x5e, 0xb1, 0x16, 0x0f, 0xc5, 0x40, 0x73, 0x87, 0xae, 0xf9, 0x58, 0x54, 0x5e, + 0x8f, 0x5e, 0x87, 0xa5, 0x2d, 0x04, 0xe3, 0xf1, 0xb9, 0x05, 0xaf, 0x49, 0x18, 0x36, 0xe9, 0x5a, + 0x4b, 0xa8, 0xbc, 0x68, 0x06, 0xb6, 0x55, 0x46, 0x1d, 0x34, 0x3b, 0x63, 0x0f, 0xef, 0x6d, 0x9a, + 0xfc, 0x11, 0xc3, 0x11, 0x46, 0x09, 0x7f, 0x8b, 0xe0, 0x98, 0x98, 0x2b, 0x70, 0xf4, 0x09, 0x1b, + 0x71, 0xa7, 0x94, 0x2e, 0xef, 0xc1, 0x93, 0x0b, 0x23, 0xcf, 0x3d, 0x7d, 0xf1, 0xdb, 0xf3, 0xd4, + 0xbb, 0xf8, 0x1d, 0xc2, 0x2e, 0xc4, 0xfe, 0x5d, 0x98, 0x5f, 0x9b, 0xbd, 0x71, 0x9b, 0x6c, 0xb4, + 0x2a, 0xd0, 0x24, 0x6e, 0x5d, 0x6c, 0xb2, 0x21, 0xaa, 0xd5, 0xc4, 0xcf, 0x10, 0xf4, 0x7b, 0x43, + 0x3e, 0xde, 0x7d, 0x6f, 0xef, 0x15, 0x90, 0xae, 0xec, 0xc5, 0x55, 0xe0, 0xbc, 0xc4, 0x70, 0x8e, + 0xe1, 0x0b, 0x89, 0x38, 0xf1, 0x0f, 0x08, 0x70, 0xe7, 0xcd, 0x03, 0x4f, 0x25, 0xec, 0x14, 0x77, + 0x65, 0x92, 0xae, 0x75, 0x17, 0x24, 0x80, 0x5e, 0x67, 0x40, 0x67, 0xf0, 0x74, 0x34, 0x50, 0x3f, + 0xd0, 0xd5, 0xd4, 0x7f, 0x68, 0xb6, 0x18, 0x6c, 0xb9, 0x0c, 0x3a, 0xc6, 0xfe, 0x44, 0x06, 0x71, + 0xf7, 0x8f, 0x44, 0x06, 0xb1, 0x37, 0x0b, 0xf9, 0x2e, 0x63, 0xb0, 0x80, 0x6f, 0xec, 0xbf, 0x25, + 0x48, 0xf0, 0x3e, 0x82, 0xbf, 0x4c, 0xc1, 0x70, 0xe4, 0x70, 0x8c, 0xa7, 0x77, 0x07, 0x18, 0x35, + 0xf9, 0x4b, 0x6f, 0x77, 0x1d, 0x27, 0xb8, 0x7d, 0x86, 0x18, 0xb9, 0x26, 0xde, 0xe8, 0x85, 0x5c, + 0x78, 0x8e, 0x27, 0xe2, 0x3e, 0x40, 0x36, 0xc2, 0xb7, 0x8a, 0x26, 0xe1, 0x67, 0x40, 0xcb, 0xce, + 0x9f, 0x9b, 0xf8, 0x17, 0x04, 0xaf, 0xb5, 0x8f, 0x57, 0x38, 0x17, 0xcf, 0x29, 0x66, 0xba, 0x96, + 0x26, 0xbb, 0x09, 0x11, 0x0a, 0x7c, 0xc8, 0x04, 0x78, 0x84, 0x1f, 0xf4, 0x20, 0x40, 0xc7, 0x07, + 0xc8, 0x26, 0x1b, 0xde, 0xc9, 0xda, 0xc4, 0x2f, 0x10, 0x9c, 0xe9, 0x18, 0x1e, 0x71, 0x17, 0x58, + 0xfd, 0x37, 0x70, 0xaa, 0xab, 0x18, 0x41, 0xf0, 0x3e, 0x23, 0x78, 0x17, 0xdf, 0x3e, 0x50, 0x82, + 0x78, 0x07, 0xc1, 0x70, 0xe4, 0x9c, 0x96, 0xd4, 0xc4, 0x49, 0x23, 0x65, 0x52, 0x13, 0x27, 0x0e, + 0x84, 0xf2, 0x43, 0xc6, 0x70, 0x09, 0xdf, 0xeb, 0x9d, 0xa1, 0xa6, 0xaf, 0x84, 0x6a, 0xf7, 0x79, + 0x0a, 0xce, 0x74, 0x4c, 0x4a, 0x49, 0xb5, 0x8b, 0x9b, 0xf7, 0x92, 0x6a, 0x17, 0x3b, 0x8a, 0xc9, + 0x5f, 0xf0, 0xd7, 0xf3, 0x53, 0x84, 0x3f, 0x39, 0xe0, 0xf6, 0x4c, 0x98, 0x99, 0x9a, 0xa4, 0xee, + 0x03, 0xca, 0x57, 0x05, 0xe5, 0x3f, 0x11, 0x9c, 0x0c, 0x8d, 0x48, 0x58, 0x49, 0x26, 0xd4, 0x3e, + 0xe0, 0x49, 0x64, 0xcf, 0xfe, 0x82, 0xfc, 0x53, 0x4e, 0xfe, 0x63, 0xfc, 0xd1, 0xbf, 0xcd, 0x9d, + 0x61, 0x61, 0xbd, 0x80, 0x7f, 0x42, 0x30, 0x18, 0x31, 0x48, 0xe1, 0x84, 0x4f, 0x49, 0xfc, 0x4c, + 0x27, 0xbd, 0xd5, 0x65, 0x94, 0x50, 0x62, 0x91, 0x09, 0x71, 0x0b, 0xdf, 0xec, 0x41, 0x88, 0xd0, + 0xb8, 0x37, 0xa7, 0x6e, 0x6e, 0x67, 0xd1, 0xd6, 0x76, 0x16, 0xfd, 0xba, 0x9d, 0x45, 0x5f, 0xed, + 0x64, 0xfb, 0xb6, 0x76, 0xb2, 0x7d, 0x3f, 0xef, 0x64, 0xfb, 0x1e, 0xcd, 0x94, 0x0c, 0xa7, 0x5c, + 0x2f, 0x28, 0xba, 0x55, 0x21, 0xe2, 0xef, 0x07, 0xfc, 0x9f, 0xab, 0x76, 0x71, 0x85, 0xac, 0x11, + 0xff, 0xef, 0x04, 0x6f, 0x5e, 0xbb, 0xea, 0x21, 0x71, 0xd6, 0xab, 0xd4, 0x2e, 0x1c, 0x65, 0xff, + 0x61, 0x33, 0xf5, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0xd1, 0xa1, 0x4e, 0xce, 0x18, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/04-channel/types/query.pb.gw.go b/x/ibc/core/04-channel/types/query.pb.gw.go similarity index 100% rename from x/ibc/04-channel/types/query.pb.gw.go rename to x/ibc/core/04-channel/types/query.pb.gw.go diff --git a/x/ibc/05-port/keeper/keeper.go b/x/ibc/core/05-port/keeper/keeper.go similarity index 95% rename from x/ibc/05-port/keeper/keeper.go rename to x/ibc/core/05-port/keeper/keeper.go index 011b20c12d..5321aeb66a 100644 --- a/x/ibc/05-port/keeper/keeper.go +++ b/x/ibc/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/05-port/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) // Keeper defines the IBC connection keeper diff --git a/x/ibc/05-port/keeper/keeper_test.go b/x/ibc/core/05-port/keeper/keeper_test.go similarity index 97% rename from x/ibc/05-port/keeper/keeper_test.go rename to x/ibc/core/05-port/keeper/keeper_test.go index ec753a1667..29c0e15857 100644 --- a/x/ibc/05-port/keeper/keeper_test.go +++ b/x/ibc/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/05-port/keeper" + "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/keeper" ) var ( diff --git a/x/ibc/05-port/types/errors.go b/x/ibc/core/05-port/types/errors.go similarity index 100% rename from x/ibc/05-port/types/errors.go rename to x/ibc/core/05-port/types/errors.go diff --git a/x/ibc/05-port/types/keys.go b/x/ibc/core/05-port/types/keys.go similarity index 100% rename from x/ibc/05-port/types/keys.go rename to x/ibc/core/05-port/types/keys.go diff --git a/x/ibc/05-port/types/module.go b/x/ibc/core/05-port/types/module.go similarity index 95% rename from x/ibc/05-port/types/module.go rename to x/ibc/core/05-port/types/module.go index 5aa6f3e66d..a619cd4b7f 100644 --- a/x/ibc/05-port/types/module.go +++ b/x/ibc/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/04-channel/types" + channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" ) // IBCModule defines an interface that implements all the callbacks diff --git a/x/ibc/05-port/types/router.go b/x/ibc/core/05-port/types/router.go similarity index 100% rename from x/ibc/05-port/types/router.go rename to x/ibc/core/05-port/types/router.go diff --git a/x/ibc/05-port/types/utils.go b/x/ibc/core/05-port/types/utils.go similarity index 100% rename from x/ibc/05-port/types/utils.go rename to x/ibc/core/05-port/types/utils.go diff --git a/x/ibc/23-commitment/types/codec.go b/x/ibc/core/23-commitment/types/codec.go similarity index 86% rename from x/ibc/23-commitment/types/codec.go rename to x/ibc/core/23-commitment/types/codec.go index 750bda8b3c..4d7312cd77 100644 --- a/x/ibc/23-commitment/types/codec.go +++ b/x/ibc/core/23-commitment/types/codec.go @@ -3,7 +3,7 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // RegisterInterfaces registers the commitment interfaces to protobuf Any. @@ -44,10 +44,10 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { } var ( - // SubModuleCdc references the global x/ibc/23-commitmentl module codec. Note, the codec should + // SubModuleCdc references the global x/ibc/core/23-commitmentl module codec. Note, the codec should // ONLY be used in certain instances of tests and for JSON encoding. // - // The actual codec used for serialization should be provided to x/ibc/23-commitmentl and + // The actual codec used for serialization should be provided to x/ibc/core/23-commitmentl and // defined at the application level. SubModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry()) ) diff --git a/x/ibc/23-commitment/types/commitment.pb.go b/x/ibc/core/23-commitment/types/commitment.pb.go similarity index 91% rename from x/ibc/23-commitment/types/commitment.pb.go rename to x/ibc/core/23-commitment/types/commitment.pb.go index f0fc8ef019..ac72127113 100644 --- a/x/ibc/23-commitment/types/commitment.pb.go +++ b/x/ibc/core/23-commitment/types/commitment.pb.go @@ -322,39 +322,39 @@ func init() { } var fileDescriptor_7921d88972a41469 = []byte{ - // 498 bytes of a gzipped FileDescriptorProto + // 499 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x4f, 0x6f, 0xd3, 0x30, 0x18, 0xc6, 0x13, 0x5a, 0xe8, 0x70, 0x27, 0x28, 0x16, 0x7f, 0xaa, 0xc2, 0x92, 0x2a, 0x48, 0x30, - 0x90, 0x16, 0xab, 0x1d, 0x70, 0xe8, 0x09, 0x75, 0x0d, 0xac, 0xea, 0xe8, 0x2a, 0x4f, 0x45, 0x03, + 0x90, 0x16, 0xab, 0x1d, 0x5c, 0xca, 0x05, 0x75, 0x0d, 0xac, 0xea, 0xe8, 0x2a, 0x4f, 0x45, 0x03, 0x09, 0x55, 0x69, 0xea, 0x26, 0x51, 0x96, 0x38, 0x4a, 0xcc, 0xb4, 0x7c, 0x83, 0x89, 0x13, 0x47, 0x2e, 0x48, 0x48, 0x7c, 0x99, 0x1d, 0x77, 0xe4, 0x54, 0xa1, 0xf6, 0x1b, 0xec, 0x13, 0x20, 0xdb, - 0xad, 0x16, 0x24, 0xd8, 0x29, 0xaf, 0xf5, 0xfe, 0xde, 0x3c, 0x8f, 0x1f, 0xbf, 0xe0, 0xa9, 0x3f, - 0x76, 0x90, 0x43, 0x13, 0x82, 0x1c, 0x1a, 0x86, 0x3e, 0x0b, 0x49, 0xc4, 0xd0, 0x71, 0x23, 0x77, - 0x32, 0xe3, 0x84, 0x32, 0x0a, 0xef, 0xfb, 0x63, 0xc7, 0xe4, 0xa0, 0x99, 0x6b, 0x1d, 0x37, 0x6a, - 0x77, 0x5d, 0xea, 0x52, 0x81, 0x20, 0x5e, 0x49, 0xba, 0xb6, 0xc1, 0x48, 0x34, 0x21, 0x49, 0xe8, - 0x47, 0x0c, 0x39, 0x49, 0x16, 0x33, 0x8a, 0xe2, 0x84, 0xd2, 0xa9, 0x6c, 0x1b, 0x4f, 0x00, 0x78, - 0x47, 0x92, 0xe0, 0x88, 0x60, 0x4a, 0x19, 0x84, 0xa0, 0xe8, 0xd9, 0xa9, 0x57, 0x55, 0xeb, 0xea, - 0xe6, 0x3a, 0x16, 0x75, 0xab, 0x78, 0xfa, 0x43, 0x57, 0x8c, 0x0e, 0x58, 0x97, 0xdc, 0x20, 0x21, - 0x53, 0xff, 0x04, 0xbe, 0x00, 0x20, 0x20, 0xd9, 0x28, 0x16, 0x27, 0xc9, 0xb7, 0xef, 0x5d, 0xcc, - 0xf4, 0x3b, 0x99, 0x1d, 0x1e, 0xb5, 0x8c, 0xcb, 0x9e, 0x81, 0x6f, 0x06, 0x24, 0x93, 0x53, 0x86, - 0xbb, 0x52, 0x1b, 0xd8, 0xcc, 0x83, 0x07, 0x60, 0x4d, 0x70, 0x36, 0x93, 0x8a, 0xe5, 0xa6, 0x6e, - 0xfe, 0xfb, 0x6e, 0x66, 0x8f, 0x64, 0x7c, 0xa4, 0xfd, 0xe0, 0x6c, 0xa6, 0x2b, 0x17, 0x33, 0xfd, - 0x76, 0x4e, 0xc6, 0x66, 0x9e, 0x81, 0x4b, 0x81, 0x24, 0x5a, 0xc5, 0x6f, 0xdc, 0xee, 0x6b, 0x50, - 0x5e, 0xd9, 0xa5, 0x74, 0x0a, 0x1b, 0xe0, 0xba, 0xb8, 0xf4, 0x52, 0xe6, 0xa1, 0x79, 0x19, 0x8a, - 0x29, 0x43, 0x31, 0x05, 0xb8, 0x1f, 0xa7, 0x58, 0x92, 0x46, 0x07, 0x94, 0x96, 0xa2, 0x10, 0x81, - 0x62, 0x40, 0xb2, 0xb4, 0xaa, 0xd6, 0x0b, 0x62, 0xf8, 0xff, 0x1e, 0xb1, 0x00, 0x5b, 0x6b, 0x3c, - 0x32, 0xe1, 0xe3, 0x3d, 0x28, 0xf4, 0x48, 0xc6, 0x73, 0x8d, 0xec, 0x90, 0xac, 0x72, 0xe5, 0x35, - 0x7c, 0x09, 0x0a, 0x24, 0x72, 0xaa, 0xd7, 0xea, 0xea, 0xe6, 0xad, 0xe6, 0xe3, 0x2b, 0x7e, 0x6a, - 0x45, 0x0e, 0x9d, 0xf8, 0x91, 0x8b, 0x39, 0x2f, 0x9f, 0xe3, 0xf9, 0x27, 0x50, 0xce, 0x75, 0xe0, - 0x33, 0xf0, 0xa8, 0x67, 0x7d, 0x18, 0x59, 0xfd, 0x9d, 0xfd, 0x4e, 0xb7, 0xff, 0x76, 0x34, 0xc4, - 0x7b, 0xa3, 0x61, 0xff, 0x60, 0x60, 0xed, 0x74, 0xdf, 0x74, 0xad, 0x4e, 0x45, 0xa9, 0x95, 0xbe, - 0x7c, 0xaf, 0x17, 0x86, 0x78, 0x0f, 0x6e, 0x80, 0xca, 0x5f, 0xe8, 0xae, 0x75, 0x58, 0x51, 0x65, - 0x7b, 0xd7, 0x3a, 0xac, 0x15, 0x4f, 0x7f, 0x6a, 0x4a, 0x7b, 0x70, 0x36, 0xd7, 0xd4, 0xf3, 0xb9, - 0xa6, 0xfe, 0x9e, 0x6b, 0xea, 0xd7, 0x85, 0xa6, 0x9c, 0x2f, 0x34, 0xe5, 0xd7, 0x42, 0x53, 0x3e, - 0xbe, 0x72, 0x7d, 0xe6, 0x7d, 0x1e, 0x73, 0x97, 0xc8, 0xa1, 0x69, 0x48, 0xd3, 0xe5, 0x67, 0x2b, - 0x9d, 0x04, 0xe8, 0x04, 0xf1, 0x25, 0x6e, 0x6e, 0x6f, 0xe5, 0x56, 0x98, 0x65, 0x31, 0x49, 0xc7, - 0x37, 0xc4, 0xba, 0x6d, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x89, 0x6c, 0x9c, 0x8b, 0xe6, 0x02, - 0x00, 0x00, + 0x2d, 0x0b, 0x12, 0x70, 0xca, 0x6b, 0xbd, 0xbf, 0x37, 0xcf, 0xe3, 0xc7, 0x2f, 0x78, 0xec, 0x8f, + 0x1d, 0xe4, 0xd0, 0x84, 0x20, 0x87, 0x86, 0xa1, 0xcf, 0x42, 0x12, 0x31, 0x74, 0xdc, 0xc8, 0x9d, + 0xcc, 0x38, 0xa1, 0x8c, 0xc2, 0xbb, 0xfe, 0xd8, 0x31, 0x39, 0x68, 0xe6, 0x5a, 0xc7, 0x8d, 0xda, + 0x6d, 0x97, 0xba, 0x54, 0x20, 0x88, 0x57, 0x92, 0xae, 0x6d, 0x30, 0x12, 0x4d, 0x48, 0x12, 0xfa, + 0x11, 0x43, 0x4e, 0x92, 0xc5, 0x8c, 0xa2, 0x38, 0xa1, 0x74, 0x2a, 0xdb, 0xc6, 0x23, 0x00, 0xde, + 0x90, 0x24, 0x38, 0x22, 0x98, 0x52, 0x06, 0x21, 0x28, 0x7a, 0x76, 0xea, 0x55, 0xd5, 0xba, 0xba, + 0xb9, 0x8e, 0x45, 0xdd, 0x2a, 0x9e, 0x7e, 0xd3, 0x15, 0xa3, 0x03, 0xd6, 0x25, 0x37, 0x48, 0xc8, + 0xd4, 0x3f, 0x81, 0xcf, 0x00, 0x08, 0x48, 0x36, 0x8a, 0xc5, 0x49, 0xf2, 0xed, 0x3b, 0x17, 0x33, + 0xfd, 0x56, 0x66, 0x87, 0x47, 0x2d, 0xe3, 0xb2, 0x67, 0xe0, 0xeb, 0x01, 0xc9, 0xe4, 0x94, 0xe1, + 0xae, 0xd4, 0x06, 0x36, 0xf3, 0xe0, 0x01, 0x58, 0x13, 0x9c, 0xcd, 0xa4, 0x62, 0xb9, 0xa9, 0x9b, + 0x7f, 0xbf, 0x9b, 0xd9, 0x23, 0x19, 0x1f, 0x69, 0xdf, 0x3b, 0x9b, 0xe9, 0xca, 0xc5, 0x4c, 0xbf, + 0x99, 0x93, 0xb1, 0x99, 0x67, 0xe0, 0x52, 0x20, 0x89, 0x56, 0xf1, 0x0b, 0xb7, 0xfb, 0x12, 0x94, + 0x57, 0x76, 0x29, 0x9d, 0xc2, 0x06, 0xb8, 0x2a, 0x2e, 0xbd, 0x94, 0xb9, 0x6f, 0x5e, 0x86, 0x62, + 0xca, 0x50, 0x4c, 0x01, 0xee, 0xc7, 0x29, 0x96, 0xa4, 0xd1, 0x01, 0xa5, 0xa5, 0x28, 0x44, 0xa0, + 0x18, 0x90, 0x2c, 0xad, 0xaa, 0xf5, 0x82, 0x18, 0xfe, 0xb7, 0x47, 0x2c, 0xc0, 0xd6, 0x1a, 0x8f, + 0x4c, 0xf8, 0x78, 0x0b, 0x0a, 0x3d, 0x92, 0xf1, 0x5c, 0x23, 0x3b, 0x24, 0xab, 0x5c, 0x79, 0x0d, + 0x9f, 0x83, 0x02, 0x89, 0x9c, 0xea, 0x95, 0xba, 0xba, 0x79, 0xa3, 0xf9, 0xf0, 0x3f, 0x3f, 0xb5, + 0x22, 0x87, 0x4e, 0xfc, 0xc8, 0xc5, 0x9c, 0x97, 0xcf, 0xf1, 0xf4, 0x03, 0x28, 0xe7, 0x3a, 0xf0, + 0x09, 0x78, 0xd0, 0xb3, 0xde, 0x8d, 0xac, 0xfe, 0xce, 0x7e, 0xa7, 0xdb, 0x7f, 0x3d, 0x1a, 0xe2, + 0xbd, 0xd1, 0xb0, 0x7f, 0x30, 0xb0, 0x76, 0xba, 0xaf, 0xba, 0x56, 0xa7, 0xa2, 0xd4, 0x4a, 0x9f, + 0xbe, 0xd6, 0x0b, 0x43, 0xbc, 0x07, 0x37, 0x40, 0xe5, 0x0f, 0x74, 0xd7, 0x3a, 0xac, 0xa8, 0xb2, + 0xbd, 0x6b, 0x1d, 0xd6, 0x8a, 0xa7, 0xdf, 0x35, 0xa5, 0x3d, 0x3c, 0x9b, 0x6b, 0xea, 0xf9, 0x5c, + 0x53, 0x7f, 0xce, 0x35, 0xf5, 0xf3, 0x42, 0x53, 0xce, 0x17, 0x9a, 0xf2, 0x63, 0xa1, 0x29, 0xef, + 0x5f, 0xb8, 0x3e, 0xf3, 0x3e, 0x8e, 0xb9, 0x4b, 0xe4, 0xd0, 0x34, 0xa4, 0xe9, 0xf2, 0xb3, 0x95, + 0x4e, 0x02, 0x74, 0x82, 0x7e, 0x2f, 0x71, 0x73, 0x7b, 0x2b, 0xb7, 0xc7, 0x2c, 0x8b, 0x49, 0x3a, + 0xbe, 0x26, 0x76, 0x6e, 0xfb, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x78, 0x4b, 0x97, 0xeb, + 0x02, 0x00, 0x00, } func (m *MerkleRoot) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/23-commitment/types/commitment_test.go b/x/ibc/core/23-commitment/types/commitment_test.go similarity index 100% rename from x/ibc/23-commitment/types/commitment_test.go rename to x/ibc/core/23-commitment/types/commitment_test.go diff --git a/x/ibc/23-commitment/types/errors.go b/x/ibc/core/23-commitment/types/errors.go similarity index 100% rename from x/ibc/23-commitment/types/errors.go rename to x/ibc/core/23-commitment/types/errors.go diff --git a/x/ibc/23-commitment/types/key_path.go b/x/ibc/core/23-commitment/types/key_path.go similarity index 100% rename from x/ibc/23-commitment/types/key_path.go rename to x/ibc/core/23-commitment/types/key_path.go diff --git a/x/ibc/23-commitment/types/merkle.go b/x/ibc/core/23-commitment/types/merkle.go similarity index 99% rename from x/ibc/23-commitment/types/merkle.go rename to x/ibc/core/23-commitment/types/merkle.go index c0a1d3e5d9..40dd02e336 100644 --- a/x/ibc/23-commitment/types/merkle.go +++ b/x/ibc/core/23-commitment/types/merkle.go @@ -9,8 +9,8 @@ import ( tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // var representing the proofspecs for a SDK chain diff --git a/x/ibc/23-commitment/types/merkle_test.go b/x/ibc/core/23-commitment/types/merkle_test.go similarity index 99% rename from x/ibc/23-commitment/types/merkle_test.go rename to x/ibc/core/23-commitment/types/merkle_test.go index 8f440cfe1c..4da9099e85 100644 --- a/x/ibc/23-commitment/types/merkle_test.go +++ b/x/ibc/core/23-commitment/types/merkle_test.go @@ -9,7 +9,7 @@ import ( tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto" - "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" ) func (suite *MerkleTestSuite) TestVerifyMembership() { diff --git a/x/ibc/24-host/errors.go b/x/ibc/core/24-host/errors.go similarity index 100% rename from x/ibc/24-host/errors.go rename to x/ibc/core/24-host/errors.go diff --git a/x/ibc/24-host/keys.go b/x/ibc/core/24-host/keys.go similarity index 99% rename from x/ibc/24-host/keys.go rename to x/ibc/core/24-host/keys.go index bfc34dab7d..d266d25161 100644 --- a/x/ibc/24-host/keys.go +++ b/x/ibc/core/24-host/keys.go @@ -3,7 +3,7 @@ package host import ( "fmt" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) const ( diff --git a/x/ibc/24-host/parse.go b/x/ibc/core/24-host/parse.go similarity index 100% rename from x/ibc/24-host/parse.go rename to x/ibc/core/24-host/parse.go diff --git a/x/ibc/24-host/validate.go b/x/ibc/core/24-host/validate.go similarity index 100% rename from x/ibc/24-host/validate.go rename to x/ibc/core/24-host/validate.go diff --git a/x/ibc/24-host/validate_test.go b/x/ibc/core/24-host/validate_test.go similarity index 100% rename from x/ibc/24-host/validate_test.go rename to x/ibc/core/24-host/validate_test.go diff --git a/x/ibc/client/cli/cli.go b/x/ibc/core/client/cli/cli.go similarity index 83% rename from x/ibc/client/cli/cli.go rename to x/ibc/core/client/cli/cli.go index f05fdb6991..51bb063a6a 100644 --- a/x/ibc/client/cli/cli.go +++ b/x/ibc/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/02-client" - connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection" - channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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" solomachine "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine" tendermint "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint" ) diff --git a/x/ibc/client/query.go b/x/ibc/core/client/query.go similarity index 90% rename from x/ibc/client/query.go rename to x/ibc/core/client/query.go index 1f1c7e649d..93eb458952 100644 --- a/x/ibc/client/query.go +++ b/x/ibc/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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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" ) // QueryTendermintProof performs an ABCI query with the given key and returns diff --git a/x/ibc/exported/channel.go b/x/ibc/core/exported/channel.go similarity index 100% rename from x/ibc/exported/channel.go rename to x/ibc/core/exported/channel.go diff --git a/x/ibc/exported/client.go b/x/ibc/core/exported/client.go similarity index 100% rename from x/ibc/exported/client.go rename to x/ibc/core/exported/client.go diff --git a/x/ibc/exported/commitment.go b/x/ibc/core/exported/commitment.go similarity index 100% rename from x/ibc/exported/commitment.go rename to x/ibc/core/exported/commitment.go diff --git a/x/ibc/exported/connection.go b/x/ibc/core/exported/connection.go similarity index 100% rename from x/ibc/exported/connection.go rename to x/ibc/core/exported/connection.go diff --git a/x/ibc/genesis.go b/x/ibc/core/genesis.go similarity index 73% rename from x/ibc/genesis.go rename to x/ibc/core/genesis.go index d31c668f20..7d5d60b934 100644 --- a/x/ibc/genesis.go +++ b/x/ibc/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/02-client" - connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection" - channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel" - "github.com/cosmos/cosmos-sdk/x/ibc/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/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" ) // InitGenesis initializes the ibc state from a provided genesis diff --git a/x/ibc/genesis_test.go b/x/ibc/core/genesis_test.go similarity index 94% rename from x/ibc/genesis_test.go rename to x/ibc/core/genesis_test.go index 5e2bdf5998..b15a4f03c1 100644 --- a/x/ibc/genesis_test.go +++ b/x/ibc/core/genesis_test.go @@ -7,17 +7,17 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/simapp" - "github.com/cosmos/cosmos-sdk/x/ibc" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" + 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" 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/cosmos-sdk/x/ibc/types" ) func (suite *IBCTestSuite) TestValidateGenesis() { diff --git a/x/ibc/handler.go b/x/ibc/core/handler.go similarity index 95% rename from x/ibc/handler.go rename to x/ibc/core/handler.go index 72c8f87230..70f8e25178 100644 --- a/x/ibc/handler.go +++ b/x/ibc/core/handler.go @@ -3,14 +3,14 @@ package ibc import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - client "github.com/cosmos/cosmos-sdk/x/ibc/02-client" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types" - "github.com/cosmos/cosmos-sdk/x/ibc/keeper" + 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" + porttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/05-port/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/keeper" ) // NewHandler defines the IBC handler diff --git a/x/ibc/handler_test.go b/x/ibc/core/handler_test.go similarity index 99% rename from x/ibc/handler_test.go rename to x/ibc/core/handler_test.go index b217f37bb9..4616a726b6 100644 --- a/x/ibc/handler_test.go +++ b/x/ibc/core/handler_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/suite" - "github.com/cosmos/cosmos-sdk/x/ibc" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + ibc "github.com/cosmos/cosmos-sdk/x/ibc/core" + 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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/ibc_test.go b/x/ibc/core/ibc_test.go similarity index 92% rename from x/ibc/ibc_test.go rename to x/ibc/core/ibc_test.go index 978f57882d..1b964d9821 100644 --- a/x/ibc/ibc_test.go +++ b/x/ibc/core/ibc_test.go @@ -11,8 +11,8 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/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" ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" ) diff --git a/x/ibc/keeper/grpc_query.go b/x/ibc/core/keeper/grpc_query.go similarity index 96% rename from x/ibc/keeper/grpc_query.go rename to x/ibc/core/keeper/grpc_query.go index da49b00426..f15b116561 100644 --- a/x/ibc/keeper/grpc_query.go +++ b/x/ibc/core/keeper/grpc_query.go @@ -3,9 +3,9 @@ package keeper import ( "context" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/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" ) // ClientState implements the IBC QueryServer interface diff --git a/x/ibc/keeper/keeper.go b/x/ibc/core/keeper/keeper.go similarity index 77% rename from x/ibc/keeper/keeper.go rename to x/ibc/core/keeper/keeper.go index cd4d1aea45..e9b7a0f1e5 100644 --- a/x/ibc/keeper/keeper.go +++ b/x/ibc/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/02-client/keeper" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectionkeeper "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/keeper" - channelkeeper "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/keeper" - portkeeper "github.com/cosmos/cosmos-sdk/x/ibc/05-port/keeper" - porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types" - "github.com/cosmos/cosmos-sdk/x/ibc/types" + 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" ) var _ types.QueryServer = (*Keeper)(nil) diff --git a/x/ibc/module.go b/x/ibc/core/module.go similarity index 91% rename from x/ibc/module.go rename to x/ibc/core/module.go index 8b6f96e2a8..3f82bfcd9d 100644 --- a/x/ibc/module.go +++ b/x/ibc/core/module.go @@ -19,15 +19,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/02-client" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/client/cli" - "github.com/cosmos/cosmos-sdk/x/ibc/keeper" - "github.com/cosmos/cosmos-sdk/x/ibc/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/types" + 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" ) var ( diff --git a/x/ibc/simulation/decoder.go b/x/ibc/core/simulation/decoder.go similarity index 67% rename from x/ibc/simulation/decoder.go rename to x/ibc/core/simulation/decoder.go index 2f2f1fcb43..459eebb8f0 100644 --- a/x/ibc/simulation/decoder.go +++ b/x/ibc/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/02-client/simulation" - connectionsim "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/simulation" - channelsim "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/simulation" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/keeper" + 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" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/ibc/simulation/decoder_test.go b/x/ibc/core/simulation/decoder_test.go similarity index 85% rename from x/ibc/simulation/decoder_test.go rename to x/ibc/core/simulation/decoder_test.go index f0474f5c84..17f584d00a 100644 --- a/x/ibc/simulation/decoder_test.go +++ b/x/ibc/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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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" - "github.com/cosmos/cosmos-sdk/x/ibc/simulation" ) func TestDecodeStore(t *testing.T) { diff --git a/x/ibc/simulation/genesis.go b/x/ibc/core/simulation/genesis.go similarity index 74% rename from x/ibc/simulation/genesis.go rename to x/ibc/core/simulation/genesis.go index 1cc142e53c..d71f449250 100644 --- a/x/ibc/simulation/genesis.go +++ b/x/ibc/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/02-client/simulation" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectionsims "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/simulation" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channelsims "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/simulation" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/types" + 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" ) // Simulation parameter constants diff --git a/x/ibc/simulation/genesis_test.go b/x/ibc/core/simulation/genesis_test.go similarity index 89% rename from x/ibc/simulation/genesis_test.go rename to x/ibc/core/simulation/genesis_test.go index 9ef3f4824d..54aff75ad9 100644 --- a/x/ibc/simulation/genesis_test.go +++ b/x/ibc/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/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/simulation" - "github.com/cosmos/cosmos-sdk/x/ibc/types" + 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" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/x/ibc/spec/01_concepts.md b/x/ibc/core/spec/01_concepts.md similarity index 100% rename from x/ibc/spec/01_concepts.md rename to x/ibc/core/spec/01_concepts.md diff --git a/x/ibc/spec/02_state.md b/x/ibc/core/spec/02_state.md similarity index 100% rename from x/ibc/spec/02_state.md rename to x/ibc/core/spec/02_state.md diff --git a/x/ibc/spec/03_state_transitions.md b/x/ibc/core/spec/03_state_transitions.md similarity index 100% rename from x/ibc/spec/03_state_transitions.md rename to x/ibc/core/spec/03_state_transitions.md diff --git a/x/ibc/spec/04_messages.md b/x/ibc/core/spec/04_messages.md similarity index 100% rename from x/ibc/spec/04_messages.md rename to x/ibc/core/spec/04_messages.md diff --git a/x/ibc/spec/05_callbacks.md b/x/ibc/core/spec/05_callbacks.md similarity index 94% rename from x/ibc/spec/05_callbacks.md rename to x/ibc/core/spec/05_callbacks.md index 146a652d2d..8d81554c51 100644 --- a/x/ibc/spec/05_callbacks.md +++ b/x/ibc/core/spec/05_callbacks.md @@ -4,7 +4,7 @@ order: 5 # Callbacks -Application modules implementing the IBC module must implement the following callbacks as found in [05-port](../05-port/types/module.go). +Application modules implementing the IBC module must implement the following callbacks as found in [05-port](../core/05-port/types/module.go). ```go // IBCModule defines an interface that implements all the callbacks diff --git a/x/ibc/spec/06_events.md b/x/ibc/core/spec/06_events.md similarity index 100% rename from x/ibc/spec/06_events.md rename to x/ibc/core/spec/06_events.md diff --git a/x/ibc/spec/README.md b/x/ibc/core/spec/README.md similarity index 92% rename from x/ibc/spec/README.md rename to x/ibc/core/spec/README.md index 987a79b9e2..f08cc44c4e 100644 --- a/x/ibc/spec/README.md +++ b/x/ibc/core/spec/README.md @@ -36,17 +36,17 @@ transaction routing through `Handlers`. The following list is a mapping from each Interchain Standard to their implementation in the SDK's `x/ibc` module: -* [ICS 002 - Client Semantics](https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics): Implemented in [`x/ibc/02-client`](https://github.com/cosmos/tree/master/ibc/02-client) -* [ICS 003 - Connection Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-003-connection-semantics): Implemented in [`x/ibc/03-connection`](https://github.com/cosmos/tree/master/ibc/03-connection) -* [ICS 004 - Channel and Packet Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-004-channel-and-packet-semantics): Implemented in [`x/ibc/04-channel`](https://github.com/cosmos/tree/master/ibc/04-channel) -* [ICS 005 - Port Allocation](https://github.com/cosmos/ics/blob/master/spec/ics-005-port-allocation): Implemented in [`x/ibc/05-port`](https://github.com/cosmos/tree/master/ibc/05-port) +* [ICS 002 - Client Semantics](https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics): Implemented in [`x/ibc/core/02-client`](https://github.com/cosmos/tree/master/ibc/core/02-client) +* [ICS 003 - Connection Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-003-connection-semantics): Implemented in [`x/ibc/core/03-connection`](https://github.com/cosmos/tree/master/ibc/core/03-connection) +* [ICS 004 - Channel and Packet Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-004-channel-and-packet-semantics): Implemented in [`x/ibc/core/04-channel`](https://github.com/cosmos/tree/master/ibc/core/04-channel) +* [ICS 005 - Port Allocation](https://github.com/cosmos/ics/blob/master/spec/ics-005-port-allocation): Implemented in [`x/ibc/core/05-port`](https://github.com/cosmos/tree/master/ibc/core/05-port) * [ICS 006 - Solo Machine Client](https://github.com/cosmos/ics/blob/master/spec/ics-006-solo-machine-client): Implemented in [`x/ibc/light-clients/06-solomachine`](https://github.com/cosmos/tree/master/ibc/solomachine) * [ICS 007 - Tendermint Client](https://github.com/cosmos/ics/blob/master/spec/ics-007-tendermint-client): Implemented in [`x/ibc/light-clients/07-tendermint`](https://github.com/cosmos/tree/master/ibc/light-clients/07-tendermint) * [ICS 009 - Loopback Client](https://github.com/cosmos/ics/blob/master/spec/ics-009-loopback-client): Implemented in [`x/ibc/light-clients/09-localhost`](https://github.com/cosmos/tree/master/ibc/light-clients/09-localhost) * [ICS 018- Relayer Algorithms](https://github.com/cosmos/ics/tree/master/spec/ics-018-relayer-algorithms): Implemented in it's own [relayer repository](https://github.com/cosmos/relayer) * [ICS 020 - Fungible Token Transfer](https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer): Implemented in [`x/ibc/applications/transfer`](https://github.com/cosmos/tree/master/ibc/applications/transfer) -* [ICS 023 - Vector Commitments](https://github.com/cosmos/ics/tree/master/spec/ics-023-vector-commitments): Implemented in [`x/ibc/23-commitment`](https://github.com/cosmos/tree/master/ibc/23-commitment) -* [ICS 024 - Host Requirements](https://github.com/cosmos/ics/tree/master/spec/ics-024-host-requirements): Implemented in [`x/ibc/24-host`](https://github.com/cosmos/tree/master/ibc/24-host) +* [ICS 023 - Vector Commitments](https://github.com/cosmos/ics/tree/master/spec/ics-023-vector-commitments): Implemented in [`x/ibc/core/23-commitment`](https://github.com/cosmos/tree/master/ibc/core/23-commitment) +* [ICS 024 - Host Requirements](https://github.com/cosmos/ics/tree/master/spec/ics-024-host-requirements): Implemented in [`x/ibc/core/24-host`](https://github.com/cosmos/tree/master/ibc/core/24-host) * [ICS 025 - Handler Interface](https://github.com/cosmos/ics/tree/master/spec/ics-025-handler-interface): Handler interfaces are implemented at the top level in `x/ibc/handler.go`, which call each ICS submodule's handlers (i.e `x/ibc/{XX-ICS}/handler.go`). * [ICS 026 - Routing Module](https://github.com/cosmos/ics/blob/master/spec/ics-026-routing-module): Replaced by [ADR 15 - IBC Packet Receiver](../../../docs/architecture/adr-015-ibc-packet-receiver.md). diff --git a/x/ibc/types/codec.go b/x/ibc/core/types/codec.go similarity index 72% rename from x/ibc/types/codec.go rename to x/ibc/core/types/codec.go index d09e3a53e0..db110ac9d5 100644 --- a/x/ibc/types/codec.go +++ b/x/ibc/core/types/codec.go @@ -2,10 +2,10 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" diff --git a/x/ibc/types/genesis.go b/x/ibc/core/types/genesis.go similarity index 81% rename from x/ibc/types/genesis.go rename to x/ibc/core/types/genesis.go index 9bdb25b304..f7d78e5c11 100644 --- a/x/ibc/types/genesis.go +++ b/x/ibc/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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/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" ) var _ codectypes.UnpackInterfacesMessage = GenesisState{} diff --git a/x/ibc/types/genesis.pb.go b/x/ibc/core/types/genesis.pb.go similarity index 82% rename from x/ibc/types/genesis.pb.go rename to x/ibc/core/types/genesis.pb.go index b9b6543f6d..aed5541827 100644 --- a/x/ibc/types/genesis.pb.go +++ b/x/ibc/core/types/genesis.pb.go @@ -5,9 +5,9 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - types1 "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - types2 "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + types "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + types1 "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + types2 "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" @@ -97,27 +97,27 @@ func init() { func init() { proto.RegisterFile("ibc/core/types/v1/genesis.proto", fileDescriptor_b9a49c5663e6fc59) } var fileDescriptor_b9a49c5663e6fc59 = []byte{ - // 319 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0x31, 0x4e, 0xf3, 0x30, - 0x18, 0x86, 0x93, 0xfe, 0xd2, 0x3f, 0x04, 0x28, 0x6a, 0x04, 0x08, 0x2a, 0xe1, 0xb6, 0x51, 0x87, - 0x2e, 0xd8, 0x2a, 0x6c, 0x8c, 0x59, 0xd8, 0xc3, 0xc6, 0x82, 0x12, 0x63, 0x52, 0x43, 0x62, 0x57, - 0xb5, 0x89, 0xe8, 0x2d, 0x38, 0x56, 0xc7, 0x8e, 0x88, 0xa1, 0x42, 0xc9, 0x0d, 0x38, 0x01, 0x8a, - 0x6d, 0x92, 0x54, 0x9e, 0x12, 0xbd, 0x7e, 0xbe, 0xf7, 0xb1, 0xf2, 0xc5, 0x1b, 0xd1, 0x04, 0x23, - 0xcc, 0x57, 0x04, 0xc9, 0xf5, 0x92, 0x08, 0x54, 0xcc, 0x51, 0x4a, 0x18, 0x11, 0x54, 0xc0, 0xe5, - 0x8a, 0x4b, 0xee, 0x0f, 0x68, 0x82, 0x61, 0x0d, 0x40, 0x05, 0xc0, 0x62, 0x3e, 0x3c, 0x49, 0x79, - 0xca, 0xd5, 0x29, 0xaa, 0xdf, 0x34, 0x38, 0x1c, 0x37, 0x4d, 0x38, 0xa3, 0x84, 0x49, 0xab, 0x6a, - 0x38, 0x6d, 0x09, 0xce, 0x18, 0xc1, 0x92, 0x72, 0x66, 0x53, 0x93, 0x96, 0x5a, 0xc4, 0x8c, 0x91, - 0xcc, 0x42, 0x82, 0xaf, 0x9e, 0x77, 0x78, 0xa7, 0x93, 0x7b, 0x19, 0x4b, 0xe2, 0x3f, 0x7b, 0x7d, - 0x2d, 0x7d, 0x34, 0xe0, 0xb9, 0x3b, 0x76, 0x67, 0x07, 0xd7, 0x63, 0xd8, 0xdc, 0x5e, 0x9f, 0xc3, - 0x62, 0x0e, 0xbb, 0x93, 0xe1, 0xe5, 0x66, 0x37, 0x72, 0x7e, 0x76, 0xa3, 0xd3, 0x75, 0x9c, 0x67, - 0xb7, 0xc1, 0x7e, 0x4b, 0x10, 0x1d, 0xe9, 0xc0, 0x8c, 0xf8, 0x85, 0xe7, 0xb7, 0x57, 0x6f, 0x5c, - 0x3d, 0xe5, 0x9a, 0x76, 0x5c, 0x0d, 0x63, 0xf9, 0x26, 0xc6, 0x77, 0x61, 0x7c, 0x56, 0x5b, 0x10, - 0x0d, 0xda, 0xf0, 0xcf, 0xfb, 0xe2, 0x1d, 0x9b, 0x8f, 0xd1, 0x48, 0xff, 0x29, 0xe9, 0xa4, 0x23, - 0xd5, 0x80, 0x65, 0x04, 0xc6, 0x78, 0x66, 0x8c, 0xfb, 0x3d, 0x41, 0xd4, 0x37, 0x89, 0x19, 0x0a, - 0xc3, 0x4d, 0x09, 0xdc, 0x6d, 0x09, 0xdc, 0xef, 0x12, 0xb8, 0x1f, 0x15, 0x70, 0xb6, 0x15, 0x70, - 0x3e, 0x2b, 0xe0, 0x3c, 0xcc, 0x52, 0x2a, 0x17, 0x6f, 0x09, 0xc4, 0x3c, 0x47, 0x98, 0x8b, 0x9c, - 0x0b, 0xf3, 0xb8, 0x12, 0x4f, 0xaf, 0xe8, 0x1d, 0xd5, 0x8b, 0x53, 0x3f, 0x49, 0xf2, 0x5f, 0xed, - 0xe9, 0xe6, 0x37, 0x00, 0x00, 0xff, 0xff, 0x19, 0xab, 0xea, 0x1e, 0x5e, 0x02, 0x00, 0x00, + // 316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0x3d, 0x4e, 0xc3, 0x30, + 0x18, 0x86, 0x93, 0x22, 0x31, 0x04, 0x28, 0x6a, 0x04, 0x08, 0x2a, 0xe1, 0x36, 0x51, 0x07, 0x96, + 0xda, 0x0a, 0x6c, 0x8c, 0x5d, 0xba, 0x87, 0x8d, 0x05, 0x25, 0xc6, 0xa4, 0x86, 0xc4, 0xae, 0x6a, + 0x13, 0xd1, 0x5b, 0x70, 0xac, 0x8e, 0x1d, 0x11, 0x43, 0x85, 0x92, 0x1b, 0x70, 0x02, 0xd4, 0xd8, + 0xe4, 0x47, 0x9e, 0x12, 0xbd, 0x7e, 0xbe, 0xf7, 0xf9, 0x94, 0xd8, 0x19, 0xd1, 0x18, 0x23, 0xcc, + 0x57, 0x04, 0xc9, 0xf5, 0x92, 0x08, 0x94, 0x07, 0x28, 0x21, 0x8c, 0x08, 0x2a, 0xe0, 0x72, 0xc5, + 0x25, 0x77, 0x07, 0x34, 0xc6, 0x70, 0x0f, 0xc0, 0x0a, 0x80, 0x79, 0x30, 0x3c, 0x4b, 0x78, 0xc2, + 0xab, 0x53, 0xb4, 0x7f, 0x53, 0xe0, 0x70, 0x5c, 0x37, 0xe1, 0x94, 0x12, 0x26, 0x8d, 0xaa, 0xe1, + 0xa4, 0x21, 0x38, 0x63, 0x04, 0x4b, 0xca, 0x99, 0x49, 0x79, 0x0d, 0xb5, 0x88, 0x18, 0x23, 0xa9, + 0x81, 0xf8, 0xdf, 0x3d, 0xe7, 0x78, 0xae, 0x92, 0x07, 0x19, 0x49, 0xe2, 0xbe, 0x38, 0x7d, 0x25, + 0x7d, 0xd2, 0xe0, 0xa5, 0x3d, 0xb6, 0x6f, 0x8e, 0x6e, 0xc7, 0xb0, 0xde, 0x5e, 0x9d, 0xc3, 0x3c, + 0x80, 0xed, 0xc9, 0xd9, 0xf5, 0x66, 0x37, 0xb2, 0x7e, 0x77, 0xa3, 0xf3, 0x75, 0x94, 0xa5, 0xf7, + 0x7e, 0xb7, 0xc5, 0x0f, 0x4f, 0x54, 0xa0, 0x47, 0xdc, 0xdc, 0x71, 0x9b, 0xd5, 0x6b, 0x57, 0xaf, + 0x72, 0x4d, 0x5a, 0xae, 0x9a, 0x31, 0x7c, 0x9e, 0xf6, 0x5d, 0x69, 0x9f, 0xd1, 0xe6, 0x87, 0x83, + 0x26, 0xfc, 0xf7, 0xbe, 0x3a, 0xa7, 0xfa, 0x63, 0xd4, 0xd2, 0x83, 0x4a, 0xea, 0xb5, 0xa4, 0x0a, + 0x30, 0x8c, 0x40, 0x1b, 0x2f, 0xb4, 0xb1, 0xdb, 0xe3, 0x87, 0x7d, 0x9d, 0xe8, 0xa1, 0xd9, 0x7c, + 0x53, 0x00, 0x7b, 0x5b, 0x00, 0xfb, 0xa7, 0x00, 0xf6, 0x67, 0x09, 0xac, 0x6d, 0x09, 0xac, 0xaf, + 0x12, 0x58, 0x8f, 0xd3, 0x84, 0xca, 0xc5, 0x7b, 0x0c, 0x31, 0xcf, 0x10, 0xe6, 0x22, 0xe3, 0x42, + 0x3f, 0xa6, 0xe2, 0xf9, 0x0d, 0x7d, 0xa0, 0xee, 0x55, 0x8a, 0x0f, 0xab, 0x9f, 0x75, 0xf7, 0x17, + 0x00, 0x00, 0xff, 0xff, 0x90, 0x81, 0x26, 0xd1, 0x63, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/types/query.go b/x/ibc/core/types/query.go similarity index 57% rename from x/ibc/types/query.go rename to x/ibc/core/types/query.go index d02d36500f..fba69b3a19 100644 --- a/x/ibc/types/query.go +++ b/x/ibc/core/types/query.go @@ -3,12 +3,12 @@ package types import ( "github.com/gogo/protobuf/grpc" - client "github.com/cosmos/cosmos-sdk/x/ibc/02-client" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + 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" ) // QueryServer defines the IBC interfaces that the gRPC query server must implement diff --git a/x/ibc/light-clients/06-solomachine/client/cli/tx.go b/x/ibc/light-clients/06-solomachine/client/cli/tx.go index eabdc0aa29..dec55d1622 100644 --- a/x/ibc/light-clients/06-solomachine/client/cli/tx.go +++ b/x/ibc/light-clients/06-solomachine/client/cli/tx.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/version" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" ) diff --git a/x/ibc/light-clients/06-solomachine/types/client_state.go b/x/ibc/light-clients/06-solomachine/types/client_state.go index a26dc1f5d4..8dbe750bb6 100644 --- a/x/ibc/light-clients/06-solomachine/types/client_state.go +++ b/x/ibc/light-clients/06-solomachine/types/client_state.go @@ -7,10 +7,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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var _ exported.ClientState = (*ClientState)(nil) diff --git a/x/ibc/light-clients/06-solomachine/types/client_state_test.go b/x/ibc/light-clients/06-solomachine/types/client_state_test.go index 797254e173..2f2296e686 100644 --- a/x/ibc/light-clients/06-solomachine/types/client_state_test.go +++ b/x/ibc/light-clients/06-solomachine/types/client_state_test.go @@ -1,11 +1,11 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/light-clients/06-solomachine/types/codec.go b/x/ibc/light-clients/06-solomachine/types/codec.go index 420a169065..6907a93514 100644 --- a/x/ibc/light-clients/06-solomachine/types/codec.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // RegisterInterfaces register the ibc channel submodule interfaces to protobuf diff --git a/x/ibc/light-clients/06-solomachine/types/codec_test.go b/x/ibc/light-clients/06-solomachine/types/codec_test.go index 6713462e17..5f9589466e 100644 --- a/x/ibc/light-clients/06-solomachine/types/codec_test.go +++ b/x/ibc/light-clients/06-solomachine/types/codec_test.go @@ -1,9 +1,9 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/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" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/light-clients/06-solomachine/types/consensus_state.go b/x/ibc/light-clients/06-solomachine/types/consensus_state.go index 387620939c..f912aa3501 100644 --- a/x/ibc/light-clients/06-solomachine/types/consensus_state.go +++ b/x/ibc/light-clients/06-solomachine/types/consensus_state.go @@ -6,8 +6,8 @@ import ( tmcrypto "github.com/tendermint/tendermint/crypto" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) var _ exported.ConsensusState = ConsensusState{} diff --git a/x/ibc/light-clients/06-solomachine/types/header.go b/x/ibc/light-clients/06-solomachine/types/header.go index d53eb164a6..b28477fba2 100644 --- a/x/ibc/light-clients/06-solomachine/types/header.go +++ b/x/ibc/light-clients/06-solomachine/types/header.go @@ -6,8 +6,8 @@ import ( tmcrypto "github.com/tendermint/tendermint/crypto" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) var _ exported.Header = Header{} diff --git a/x/ibc/light-clients/06-solomachine/types/misbehaviour.go b/x/ibc/light-clients/06-solomachine/types/misbehaviour.go index 55c28bae71..4b4175bf06 100644 --- a/x/ibc/light-clients/06-solomachine/types/misbehaviour.go +++ b/x/ibc/light-clients/06-solomachine/types/misbehaviour.go @@ -6,9 +6,9 @@ import ( yaml "gopkg.in/yaml.v2" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var ( diff --git a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle.go b/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle.go index c65df9ab64..45ae344cdc 100644 --- a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // CheckMisbehaviourAndUpdateState determines whether or not the currently registered diff --git a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go b/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go index f35ed46b78..bec4afaf27 100644 --- a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go +++ b/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go @@ -1,7 +1,7 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" diff --git a/x/ibc/light-clients/06-solomachine/types/proof.go b/x/ibc/light-clients/06-solomachine/types/proof.go index 9054ea0885..7a5204e7f7 100644 --- a/x/ibc/light-clients/06-solomachine/types/proof.go +++ b/x/ibc/light-clients/06-solomachine/types/proof.go @@ -7,11 +7,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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // VerifySignature verifies if the the provided public key generated the signature diff --git a/x/ibc/light-clients/06-solomachine/types/proposal_handle.go b/x/ibc/light-clients/06-solomachine/types/proposal_handle.go index ecd078954e..f715ebb4c5 100644 --- a/x/ibc/light-clients/06-solomachine/types/proposal_handle.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // CheckProposedHeaderAndUpdateState updates the consensus state to the header's sequence and diff --git a/x/ibc/light-clients/06-solomachine/types/proposal_handle_test.go b/x/ibc/light-clients/06-solomachine/types/proposal_handle_test.go index 09b8c8a3e6..5b5fa7616c 100644 --- a/x/ibc/light-clients/06-solomachine/types/proposal_handle_test.go +++ b/x/ibc/light-clients/06-solomachine/types/proposal_handle_test.go @@ -1,7 +1,7 @@ package types_test import ( - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" diff --git a/x/ibc/light-clients/06-solomachine/types/solomachine.go b/x/ibc/light-clients/06-solomachine/types/solomachine.go index bc5e6dd5cc..06d8fc05f6 100644 --- a/x/ibc/light-clients/06-solomachine/types/solomachine.go +++ b/x/ibc/light-clients/06-solomachine/types/solomachine.go @@ -4,7 +4,7 @@ import ( "github.com/tendermint/tendermint/crypto" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // Interface implementation checks. diff --git a/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go b/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go index 944b9b6c98..c760a320f7 100644 --- a/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go +++ b/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" - types1 "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - types2 "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" + types1 "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types" + types2 "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" diff --git a/x/ibc/light-clients/06-solomachine/types/solomachine_test.go b/x/ibc/light-clients/06-solomachine/types/solomachine_test.go index e2c79e3856..d58cde7b11 100644 --- a/x/ibc/light-clients/06-solomachine/types/solomachine_test.go +++ b/x/ibc/light-clients/06-solomachine/types/solomachine_test.go @@ -13,8 +13,8 @@ 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/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/light-clients/06-solomachine/types/update.go b/x/ibc/light-clients/06-solomachine/types/update.go index e6fe938be0..a7c288cfc8 100644 --- a/x/ibc/light-clients/06-solomachine/types/update.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // CheckHeaderAndUpdateState checks if the provided header is valid and updates diff --git a/x/ibc/light-clients/06-solomachine/types/update_test.go b/x/ibc/light-clients/06-solomachine/types/update_test.go index a33e0a9d6b..a58b00dc48 100644 --- a/x/ibc/light-clients/06-solomachine/types/update_test.go +++ b/x/ibc/light-clients/06-solomachine/types/update_test.go @@ -3,7 +3,7 @@ package types_test import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/tx" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "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" diff --git a/x/ibc/light-clients/07-tendermint/client/cli/tx.go b/x/ibc/light-clients/07-tendermint/client/cli/tx.go index 374b1eeba6..41d3d9d6c9 100644 --- a/x/ibc/light-clients/07-tendermint/client/cli/tx.go +++ b/x/ibc/light-clients/07-tendermint/client/cli/tx.go @@ -17,8 +17,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/version" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" ) diff --git a/x/ibc/light-clients/07-tendermint/types/client_state.go b/x/ibc/light-clients/07-tendermint/types/client_state.go index 5c43d45706..08acc4fca9 100644 --- a/x/ibc/light-clients/07-tendermint/types/client_state.go +++ b/x/ibc/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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var _ exported.ClientState = (*ClientState)(nil) diff --git a/x/ibc/light-clients/07-tendermint/types/client_state_test.go b/x/ibc/light-clients/07-tendermint/types/client_state_test.go index 9a6eb8d603..5c71ec4210 100644 --- a/x/ibc/light-clients/07-tendermint/types/client_state_test.go +++ b/x/ibc/light-clients/07-tendermint/types/client_state_test.go @@ -3,11 +3,11 @@ package types_test import ( ics23 "github.com/confio/ics23/go" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/ibc/light-clients/07-tendermint/types/codec.go b/x/ibc/light-clients/07-tendermint/types/codec.go index d1befac520..c46aa0d795 100644 --- a/x/ibc/light-clients/07-tendermint/types/codec.go +++ b/x/ibc/light-clients/07-tendermint/types/codec.go @@ -3,7 +3,7 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // RegisterInterfaces registers the tendermint concrete client-related diff --git a/x/ibc/light-clients/07-tendermint/types/consensus_state.go b/x/ibc/light-clients/07-tendermint/types/consensus_state.go index b6d168f555..0a8981281c 100644 --- a/x/ibc/light-clients/07-tendermint/types/consensus_state.go +++ b/x/ibc/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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // NewConsensusState creates a new ConsensusState instance. diff --git a/x/ibc/light-clients/07-tendermint/types/consensus_state_test.go b/x/ibc/light-clients/07-tendermint/types/consensus_state_test.go index ee5672b75e..a3a8b154a6 100644 --- a/x/ibc/light-clients/07-tendermint/types/consensus_state_test.go +++ b/x/ibc/light-clients/07-tendermint/types/consensus_state_test.go @@ -3,7 +3,7 @@ package types_test import ( "time" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" ) diff --git a/x/ibc/light-clients/07-tendermint/types/header.go b/x/ibc/light-clients/07-tendermint/types/header.go index a441d5afd4..86e166caf5 100644 --- a/x/ibc/light-clients/07-tendermint/types/header.go +++ b/x/ibc/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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var _ exported.Header = Header{} diff --git a/x/ibc/light-clients/07-tendermint/types/header_test.go b/x/ibc/light-clients/07-tendermint/types/header_test.go index cbaeebb42f..235e1f7584 100644 --- a/x/ibc/light-clients/07-tendermint/types/header_test.go +++ b/x/ibc/light-clients/07-tendermint/types/header_test.go @@ -5,7 +5,7 @@ import ( tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" ) diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour.go index e4461b3fa4..b1277110a2 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour.go @@ -10,9 +10,9 @@ import ( tmtypes "github.com/tendermint/tendermint/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var ( diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go index 7bc2efbddd..2e52f0070e 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // CheckMisbehaviourAndUpdateState determines whether or not two conflicting diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go index 00fa175019..54fecf4ab9 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go @@ -9,9 +9,9 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/simapp" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" ) diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go index 9e2c741b21..9571697149 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go @@ -8,7 +8,7 @@ import ( tmtypes "github.com/tendermint/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" ) diff --git a/x/ibc/light-clients/07-tendermint/types/proposal_handle.go b/x/ibc/light-clients/07-tendermint/types/proposal_handle.go index 3e08efa901..7e27f543a0 100644 --- a/x/ibc/light-clients/07-tendermint/types/proposal_handle.go +++ b/x/ibc/light-clients/07-tendermint/types/proposal_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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // CheckProposedHeaderAndUpdateState will try to update the client with the new header if and diff --git a/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go b/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go index 93570674d4..33c10854e7 100644 --- a/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go +++ b/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go @@ -1,7 +1,7 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" ) diff --git a/x/ibc/light-clients/07-tendermint/types/store.go b/x/ibc/light-clients/07-tendermint/types/store.go index c7844a2781..cebd3b8eca 100644 --- a/x/ibc/light-clients/07-tendermint/types/store.go +++ b/x/ibc/light-clients/07-tendermint/types/store.go @@ -4,9 +4,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/02-client/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // GetConsensusState retrieves the consensus state from the client prefixed diff --git a/x/ibc/light-clients/07-tendermint/types/store_test.go b/x/ibc/light-clients/07-tendermint/types/store_test.go index 21820ce552..42bee567c3 100644 --- a/x/ibc/light-clients/07-tendermint/types/store_test.go +++ b/x/ibc/light-clients/07-tendermint/types/store_test.go @@ -1,10 +1,10 @@ package types_test import ( - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" ) diff --git a/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go b/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go index bd24c6daeb..d80ade43ee 100644 --- a/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go +++ b/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" _go "github.com/confio/ics23/go" - types "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - types1 "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" + types "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + types1 "github.com/cosmos/cosmos-sdk/x/ibc/core/23-commitment/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" diff --git a/x/ibc/light-clients/07-tendermint/types/tendermint_test.go b/x/ibc/light-clients/07-tendermint/types/tendermint_test.go index 031ca1270d..466b62ff7f 100644 --- a/x/ibc/light-clients/07-tendermint/types/tendermint_test.go +++ b/x/ibc/light-clients/07-tendermint/types/tendermint_test.go @@ -13,8 +13,8 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" 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" diff --git a/x/ibc/light-clients/07-tendermint/types/test_utils.go b/x/ibc/light-clients/07-tendermint/types/test_utils.go index 0e204153af..5e19849053 100644 --- a/x/ibc/light-clients/07-tendermint/types/test_utils.go +++ b/x/ibc/light-clients/07-tendermint/types/test_utils.go @@ -10,7 +10,7 @@ import ( tmtypes "github.com/tendermint/tendermint/types" tmversion "github.com/tendermint/tendermint/version" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" ) // MakeBlockID is a copied unimported test function from tmtypes to use here diff --git a/x/ibc/light-clients/07-tendermint/types/update.go b/x/ibc/light-clients/07-tendermint/types/update.go index b2de7bab7d..996ae622ca 100644 --- a/x/ibc/light-clients/07-tendermint/types/update.go +++ b/x/ibc/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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // CheckHeaderAndUpdateState checks if the provided header is valid, and if valid it will: diff --git a/x/ibc/light-clients/07-tendermint/types/update_test.go b/x/ibc/light-clients/07-tendermint/types/update_test.go index 1a3351cce4..cfb15b491b 100644 --- a/x/ibc/light-clients/07-tendermint/types/update_test.go +++ b/x/ibc/light-clients/07-tendermint/types/update_test.go @@ -6,8 +6,8 @@ import ( tmtypes "github.com/tendermint/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" ) diff --git a/x/ibc/light-clients/07-tendermint/types/upgrade.go b/x/ibc/light-clients/07-tendermint/types/upgrade.go index d2f9366d1e..80fa360646 100644 --- a/x/ibc/light-clients/07-tendermint/types/upgrade.go +++ b/x/ibc/light-clients/07-tendermint/types/upgrade.go @@ -4,9 +4,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/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) // VerifyUpgrade checks if the upgraded client has been committed by the current client diff --git a/x/ibc/light-clients/07-tendermint/types/upgrade_test.go b/x/ibc/light-clients/07-tendermint/types/upgrade_test.go index c2a67b30b6..52f876e1d0 100644 --- a/x/ibc/light-clients/07-tendermint/types/upgrade_test.go +++ b/x/ibc/light-clients/07-tendermint/types/upgrade_test.go @@ -1,8 +1,8 @@ package types_test import ( - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing" diff --git a/x/ibc/light-clients/09-localhost/types/client_state.go b/x/ibc/light-clients/09-localhost/types/client_state.go index 250091957e..639d160841 100644 --- a/x/ibc/light-clients/09-localhost/types/client_state.go +++ b/x/ibc/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/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var _ exported.ClientState = (*ClientState)(nil) diff --git a/x/ibc/light-clients/09-localhost/types/client_state_test.go b/x/ibc/light-clients/09-localhost/types/client_state_test.go index 68fc056709..82a98ea9fe 100644 --- a/x/ibc/light-clients/09-localhost/types/client_state_test.go +++ b/x/ibc/light-clients/09-localhost/types/client_state_test.go @@ -2,11 +2,11 @@ package types_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + 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/light-clients/09-localhost/types" ) diff --git a/x/ibc/light-clients/09-localhost/types/codec.go b/x/ibc/light-clients/09-localhost/types/codec.go index a6bf58a6ff..009989bf1a 100644 --- a/x/ibc/light-clients/09-localhost/types/codec.go +++ b/x/ibc/light-clients/09-localhost/types/codec.go @@ -3,7 +3,7 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) // RegisterInterfaces register the ibc interfaces submodule implementations to protobuf diff --git a/x/ibc/light-clients/09-localhost/types/localhost.pb.go b/x/ibc/light-clients/09-localhost/types/localhost.pb.go index 168dec2076..a01f162419 100644 --- a/x/ibc/light-clients/09-localhost/types/localhost.pb.go +++ b/x/ibc/light-clients/09-localhost/types/localhost.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" + types "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" diff --git a/x/ibc/light-clients/09-localhost/types/localhost_test.go b/x/ibc/light-clients/09-localhost/types/localhost_test.go index 841f8a3e4c..8ebaef843b 100644 --- a/x/ibc/light-clients/09-localhost/types/localhost_test.go +++ b/x/ibc/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/02-client/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) const ( diff --git a/x/ibc/testing/chain.go b/x/ibc/testing/chain.go index 326f39137d..4e3f31a06c 100644 --- a/x/ibc/testing/chain.go +++ b/x/ibc/testing/chain.go @@ -25,17 +25,17 @@ 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" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types" - channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" 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" "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock" - "github.com/cosmos/cosmos-sdk/x/ibc/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/x/ibc/testing/coordinator.go b/x/ibc/testing/coordinator.go index 8b5886cb43..2b7c6a466d 100644 --- a/x/ibc/testing/coordinator.go +++ b/x/ibc/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/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) var ( diff --git a/x/ibc/testing/mock/mock.go b/x/ibc/testing/mock/mock.go index e8a72ba10a..2761377361 100644 --- a/x/ibc/testing/mock/mock.go +++ b/x/ibc/testing/mock/mock.go @@ -17,8 +17,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/04-channel/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" + channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types" + host "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host" ) const ( diff --git a/x/ibc/testing/solomachine.go b/x/ibc/testing/solomachine.go index 08fb9378a5..c0f9befaa0 100644 --- a/x/ibc/testing/solomachine.go +++ b/x/ibc/testing/solomachine.go @@ -12,10 +12,10 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/types/multisig" "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/cosmos-sdk/x/auth/tx" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" - host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" - "github.com/cosmos/cosmos-sdk/x/ibc/exported" + 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" ) diff --git a/x/upgrade/abci_test.go b/x/upgrade/abci_test.go index f539594665..26c534a4d2 100644 --- a/x/upgrade/abci_test.go +++ b/x/upgrade/abci_test.go @@ -21,7 +21,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/module" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/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" "github.com/cosmos/cosmos-sdk/x/upgrade" "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index 9c943facf9..42ae20d751 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -17,8 +17,8 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/x/upgrade/keeper/keeper_test.go b/x/upgrade/keeper/keeper_test.go index e4a655e3cd..8f420e10f4 100644 --- a/x/upgrade/keeper/keeper_test.go +++ b/x/upgrade/keeper/keeper_test.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" store "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" - commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/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" ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types" "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/x/upgrade/types/plan.go b/x/upgrade/types/plan.go index 672bb98b5e..c930c2539c 100644 --- a/x/upgrade/types/plan.go +++ b/x/upgrade/types/plan.go @@ -9,8 +9,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/02-client/types" - ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/exported" + clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types" + ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/core/exported" ) var _ codectypes.UnpackInterfacesMessage = Plan{} diff --git a/x/upgrade/types/plan_test.go b/x/upgrade/types/plan_test.go index aacdacdf2b..ffa2734cbf 100644 --- a/x/upgrade/types/plan_test.go +++ b/x/upgrade/types/plan_test.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/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" sdk "github.com/cosmos/cosmos-sdk/types"