Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: increment go mod to v6 (backport #2318) #2364

Merged
merged 7 commits into from
Sep 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 21, 2022

This is an automatic backport of pull request #2318 done by Mergify.
Cherry-pick of c86d27f has failed:

On branch mergify/bp/release/v6.0.x/pr-2318
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit c86d27f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   go.mod
	modified:   modules/apps/27-interchain-accounts/client/cli/cli.go
	modified:   modules/apps/27-interchain-accounts/controller/client/cli/query.go
	modified:   modules/apps/27-interchain-accounts/controller/client/cli/tx.go
	modified:   modules/apps/27-interchain-accounts/controller/ibc_middleware.go
	modified:   modules/apps/27-interchain-accounts/controller/ibc_middleware_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/account.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/account_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/events.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/genesis.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/grpc_query_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/handshake.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/handshake_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/migrations.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/migrations_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/msg_server.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/params.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/params_test.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/relay.go
	modified:   modules/apps/27-interchain-accounts/controller/keeper/relay_test.go
	modified:   modules/apps/27-interchain-accounts/controller/migrations/v5/migrations.go
	modified:   modules/apps/27-interchain-accounts/controller/migrations/v5/migrations_test.go
	modified:   modules/apps/27-interchain-accounts/controller/types/controller.pb.go
	modified:   modules/apps/27-interchain-accounts/controller/types/msgs.go
	modified:   modules/apps/27-interchain-accounts/controller/types/msgs_test.go
	modified:   modules/apps/27-interchain-accounts/controller/types/params_test.go
	modified:   modules/apps/27-interchain-accounts/controller/types/query.pb.go
	modified:   modules/apps/27-interchain-accounts/controller/types/tx.pb.go
	modified:   modules/apps/27-interchain-accounts/genesis/types/genesis.go
	modified:   modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go
	modified:   modules/apps/27-interchain-accounts/genesis/types/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/host/client/cli/query.go
	modified:   modules/apps/27-interchain-accounts/host/ibc_module.go
	modified:   modules/apps/27-interchain-accounts/host/ibc_module_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/account.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/events.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/genesis.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/grpc_query.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/grpc_query_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/handshake.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/handshake_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/keeper.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/keeper_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/params.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/params_test.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/relay.go
	modified:   modules/apps/27-interchain-accounts/host/keeper/relay_test.go
	modified:   modules/apps/27-interchain-accounts/host/types/host.pb.go
	modified:   modules/apps/27-interchain-accounts/host/types/params_test.go
	modified:   modules/apps/27-interchain-accounts/host/types/query.pb.go
	modified:   modules/apps/27-interchain-accounts/module.go
	modified:   modules/apps/27-interchain-accounts/module_test.go
	modified:   modules/apps/27-interchain-accounts/simulation/decoder.go
	modified:   modules/apps/27-interchain-accounts/simulation/decoder_test.go
	modified:   modules/apps/27-interchain-accounts/simulation/genesis.go
	modified:   modules/apps/27-interchain-accounts/simulation/genesis_test.go
	modified:   modules/apps/27-interchain-accounts/simulation/params.go
	modified:   modules/apps/27-interchain-accounts/simulation/params_test.go
	modified:   modules/apps/27-interchain-accounts/types/account.pb.go
	modified:   modules/apps/27-interchain-accounts/types/account_test.go
	modified:   modules/apps/27-interchain-accounts/types/codec_test.go
	modified:   modules/apps/27-interchain-accounts/types/expected_keepers.go
	modified:   modules/apps/27-interchain-accounts/types/keys_test.go
	modified:   modules/apps/27-interchain-accounts/types/metadata.go
	modified:   modules/apps/27-interchain-accounts/types/metadata.pb.go
	modified:   modules/apps/27-interchain-accounts/types/metadata_test.go
	modified:   modules/apps/27-interchain-accounts/types/packet.pb.go
	modified:   modules/apps/27-interchain-accounts/types/packet_test.go
	modified:   modules/apps/27-interchain-accounts/types/port_test.go
	modified:   modules/apps/29-fee/client/cli/query.go
	modified:   modules/apps/29-fee/client/cli/tx.go
	modified:   modules/apps/29-fee/fee_test.go
	modified:   modules/apps/29-fee/ibc_middleware.go
	modified:   modules/apps/29-fee/ibc_middleware_test.go
	modified:   modules/apps/29-fee/ica_test.go
	modified:   modules/apps/29-fee/keeper/escrow.go
	modified:   modules/apps/29-fee/keeper/escrow_test.go
	modified:   modules/apps/29-fee/keeper/events.go
	modified:   modules/apps/29-fee/keeper/events_test.go
	modified:   modules/apps/29-fee/keeper/genesis.go
	modified:   modules/apps/29-fee/keeper/genesis_test.go
	modified:   modules/apps/29-fee/keeper/grpc_query.go
	modified:   modules/apps/29-fee/keeper/grpc_query_test.go
	modified:   modules/apps/29-fee/keeper/keeper.go
	modified:   modules/apps/29-fee/keeper/keeper_test.go
	modified:   modules/apps/29-fee/keeper/msg_server.go
	modified:   modules/apps/29-fee/keeper/msg_server_test.go
	modified:   modules/apps/29-fee/keeper/relay.go
	modified:   modules/apps/29-fee/keeper/relay_test.go
	modified:   modules/apps/29-fee/module.go
	modified:   modules/apps/29-fee/transfer_test.go
	modified:   modules/apps/29-fee/types/ack.pb.go
	modified:   modules/apps/29-fee/types/expected_keepers.go
	modified:   modules/apps/29-fee/types/fee.go
	modified:   modules/apps/29-fee/types/fee.pb.go
	modified:   modules/apps/29-fee/types/fee_test.go
	modified:   modules/apps/29-fee/types/genesis.go
	modified:   modules/apps/29-fee/types/genesis.pb.go
	modified:   modules/apps/29-fee/types/genesis_test.go
	modified:   modules/apps/29-fee/types/keys.go
	modified:   modules/apps/29-fee/types/keys_test.go
	modified:   modules/apps/29-fee/types/metadata.pb.go
	modified:   modules/apps/29-fee/types/msgs.go
	modified:   modules/apps/29-fee/types/msgs_test.go
	modified:   modules/apps/29-fee/types/query.pb.go
	modified:   modules/apps/29-fee/types/tx.pb.go
	modified:   modules/apps/transfer/client/cli/query.go
	modified:   modules/apps/transfer/client/cli/tx.go
	modified:   modules/apps/transfer/ibc_module.go
	modified:   modules/apps/transfer/ibc_module_test.go
	modified:   modules/apps/transfer/keeper/encoding.go
	modified:   modules/apps/transfer/keeper/genesis.go
	modified:   modules/apps/transfer/keeper/genesis_test.go
	modified:   modules/apps/transfer/keeper/grpc_query.go
	modified:   modules/apps/transfer/keeper/grpc_query_test.go
	modified:   modules/apps/transfer/keeper/keeper.go
	modified:   modules/apps/transfer/keeper/keeper_test.go
	modified:   modules/apps/transfer/keeper/mbt_relay_test.go
	modified:   modules/apps/transfer/keeper/migrations.go
	modified:   modules/apps/transfer/keeper/migrations_test.go
	modified:   modules/apps/transfer/keeper/msg_server.go
	modified:   modules/apps/transfer/keeper/msg_server_test.go
	modified:   modules/apps/transfer/keeper/params.go
	modified:   modules/apps/transfer/keeper/params_test.go
	modified:   modules/apps/transfer/keeper/relay.go
	modified:   modules/apps/transfer/keeper/relay_test.go
	modified:   modules/apps/transfer/module.go
	modified:   modules/apps/transfer/simulation/decoder.go
	modified:   modules/apps/transfer/simulation/decoder_test.go
	modified:   modules/apps/transfer/simulation/genesis.go
	modified:   modules/apps/transfer/simulation/genesis_test.go
	modified:   modules/apps/transfer/simulation/params.go
	modified:   modules/apps/transfer/simulation/params_test.go
	modified:   modules/apps/transfer/transfer_test.go
	modified:   modules/apps/transfer/types/ack_test.go
	modified:   modules/apps/transfer/types/expected_keepers.go
	modified:   modules/apps/transfer/types/genesis.go
	modified:   modules/apps/transfer/types/genesis.pb.go
	modified:   modules/apps/transfer/types/genesis_test.go
	modified:   modules/apps/transfer/types/keys_test.go
	modified:   modules/apps/transfer/types/msgs.go
	modified:   modules/apps/transfer/types/msgs_test.go
	modified:   modules/apps/transfer/types/packet.pb.go
	modified:   modules/apps/transfer/types/query.pb.go
	modified:   modules/apps/transfer/types/trace.go
	modified:   modules/apps/transfer/types/transfer.pb.go
	modified:   modules/apps/transfer/types/tx.pb.go
	modified:   modules/core/02-client/client/cli/cli.go
	modified:   modules/core/02-client/client/cli/query.go
	modified:   modules/core/02-client/client/cli/tx.go
	modified:   modules/core/02-client/client/proposal_handler.go
	modified:   modules/core/02-client/genesis.go
	modified:   modules/core/02-client/keeper/client.go
	modified:   modules/core/02-client/keeper/encoding.go
	modified:   modules/core/02-client/keeper/events.go
	modified:   modules/core/02-client/keeper/grpc_query.go
	modified:   modules/core/02-client/keeper/migrations.go
	modified:   modules/core/02-client/keeper/params.go
	modified:   modules/core/02-client/keeper/params_test.go
	modified:   modules/core/02-client/keeper/proposal.go
	modified:   modules/core/02-client/legacy/v100/solomachine.go
	modified:   modules/core/02-client/legacy/v100/solomachine.pb.go
	modified:   modules/core/02-client/module.go
	modified:   modules/core/02-client/proposal_handler.go
	modified:   modules/core/02-client/simulation/decoder.go
	modified:   modules/core/02-client/simulation/genesis.go
	modified:   modules/core/02-client/types/client.go
	modified:   modules/core/02-client/types/client.pb.go
	modified:   modules/core/02-client/types/client_test.go
	modified:   modules/core/02-client/types/codec.go
	modified:   modules/core/02-client/types/encoding.go
	modified:   modules/core/02-client/types/events.go
	modified:   modules/core/02-client/types/genesis.go
	modified:   modules/core/02-client/types/genesis.pb.go
	modified:   modules/core/02-client/types/height.go
	modified:   modules/core/02-client/types/height_test.go
	modified:   modules/core/02-client/types/keys.go
	modified:   modules/core/02-client/types/keys_test.go
	modified:   modules/core/02-client/types/msgs.go
	modified:   modules/core/02-client/types/params.go
	modified:   modules/core/02-client/types/params_test.go
	modified:   modules/core/02-client/types/proposal.go
	modified:   modules/core/02-client/types/query.go
	modified:   modules/core/02-client/types/query.pb.go
	modified:   modules/core/03-connection/client/cli/cli.go
	modified:   modules/core/03-connection/client/cli/query.go
	modified:   modules/core/03-connection/client/utils/utils.go
	modified:   modules/core/03-connection/genesis.go
	modified:   modules/core/03-connection/keeper/events.go
	modified:   modules/core/03-connection/keeper/grpc_query.go
	modified:   modules/core/03-connection/keeper/grpc_query_test.go
	modified:   modules/core/03-connection/keeper/handshake.go
	modified:   modules/core/03-connection/keeper/keeper.go
	modified:   modules/core/03-connection/keeper/params.go
	modified:   modules/core/03-connection/keeper/params_test.go
	modified:   modules/core/03-connection/module.go
	modified:   modules/core/03-connection/simulation/decoder.go
	modified:   modules/core/03-connection/simulation/decoder_test.go
	modified:   modules/core/03-connection/simulation/genesis.go
	modified:   modules/core/03-connection/types/codec.go
	modified:   modules/core/03-connection/types/connection.go
	modified:   modules/core/03-connection/types/connection.pb.go
	modified:   modules/core/03-connection/types/connection_test.go
	modified:   modules/core/03-connection/types/events.go
	modified:   modules/core/03-connection/types/expected_keepers.go
	modified:   modules/core/03-connection/types/genesis.go
	modified:   modules/core/03-connection/types/genesis.pb.go
	modified:   modules/core/03-connection/types/genesis_test.go
	modified:   modules/core/03-connection/types/keys.go
	modified:   modules/core/03-connection/types/keys_test.go
	modified:   modules/core/03-connection/types/msgs.go
	modified:   modules/core/03-connection/types/params_test.go
	modified:   modules/core/03-connection/types/query.go
	modified:   modules/core/03-connection/types/query.pb.go
	modified:   modules/core/03-connection/types/tx.pb.go
	modified:   modules/core/03-connection/types/version.go
	modified:   modules/core/03-connection/types/version_test.go
	modified:   modules/core/04-channel/client/cli/cli.go
	modified:   modules/core/04-channel/client/cli/query.go
	modified:   modules/core/04-channel/client/utils/utils.go
	modified:   modules/core/04-channel/genesis.go
	modified:   modules/core/04-channel/keeper/events.go
	modified:   modules/core/04-channel/keeper/grpc_query.go
	modified:   modules/core/04-channel/keeper/grpc_query_test.go
	modified:   modules/core/04-channel/keeper/handshake.go
	modified:   modules/core/04-channel/keeper/handshake_test.go
	modified:   modules/core/04-channel/keeper/keeper.go
	modified:   modules/core/04-channel/keeper/keeper_test.go
	modified:   modules/core/04-channel/keeper/packet.go
	modified:   modules/core/04-channel/keeper/timeout.go
	modified:   modules/core/04-channel/keeper/timeout_test.go
	modified:   modules/core/04-channel/module.go
	modified:   modules/core/04-channel/simulation/decoder.go
	modified:   modules/core/04-channel/simulation/decoder_test.go
	modified:   modules/core/04-channel/simulation/genesis.go
	modified:   modules/core/04-channel/types/acknowledgement_test.go
	modified:   modules/core/04-channel/types/channel.go
	modified:   modules/core/04-channel/types/channel.pb.go
	modified:   modules/core/04-channel/types/channel_test.go
	modified:   modules/core/04-channel/types/codec.go
	modified:   modules/core/04-channel/types/events.go
	modified:   modules/core/04-channel/types/expected_keepers.go
	modified:   modules/core/04-channel/types/genesis.go
	modified:   modules/core/04-channel/types/genesis.pb.go
	modified:   modules/core/04-channel/types/genesis_test.go
	modified:   modules/core/04-channel/types/keys.go
	modified:   modules/core/04-channel/types/keys_test.go
	modified:   modules/core/04-channel/types/msgs.go
	modified:   modules/core/04-channel/types/msgs_test.go
	modified:   modules/core/04-channel/types/packet.go
	modified:   modules/core/04-channel/types/packet_test.go
	modified:   modules/core/04-channel/types/query.go
	modified:   modules/core/04-channel/types/query.pb.go
	modified:   modules/core/04-channel/types/tx.pb.go
	modified:   modules/core/05-port/keeper/keeper.go
	modified:   modules/core/05-port/keeper/keeper_test.go
	modified:   modules/core/05-port/module.go
	modified:   modules/core/05-port/types/module.go
	modified:   modules/core/23-commitment/types/codec.go
	modified:   modules/core/23-commitment/types/commitment.pb.go
	modified:   modules/core/23-commitment/types/merkle.go
	modified:   modules/core/23-commitment/types/merkle_test.go
	modified:   modules/core/23-commitment/types/utils_test.go
	modified:   modules/core/24-host/keys.go
	modified:   modules/core/24-host/parse_test.go
	modified:   modules/core/ante/ante.go
	modified:   modules/core/ante/ante_test.go
	modified:   modules/core/client/cli/cli.go
	modified:   modules/core/client/query.go
	modified:   modules/core/genesis.go
	modified:   modules/core/keeper/grpc_query.go
	modified:   modules/core/keeper/keeper.go
	modified:   modules/core/keeper/keeper_test.go
	modified:   modules/core/keeper/migrations.go
	modified:   modules/core/keeper/msg_server.go
	modified:   modules/core/legacy/v100/genesis.go
	modified:   modules/core/module.go
	modified:   modules/core/simulation/decoder.go
	modified:   modules/core/simulation/genesis.go
	modified:   modules/core/simulation/genesis_test.go
	modified:   modules/core/types/genesis.go
	modified:   modules/core/types/genesis.pb.go
	modified:   modules/core/types/query.go
	modified:   modules/light-clients/06-solomachine/types/consensus_state.go
	modified:   modules/light-clients/06-solomachine/types/header.go
	modified:   modules/light-clients/06-solomachine/types/misbehaviour.go
	modified:   modules/light-clients/06-solomachine/types/proposal_handle.go
	modified:   modules/light-clients/07-tendermint/types/codec.go
	modified:   modules/light-clients/07-tendermint/types/consensus_state.go
	modified:   modules/light-clients/07-tendermint/types/genesis.go
	modified:   modules/light-clients/07-tendermint/types/header.go
	modified:   modules/light-clients/07-tendermint/types/misbehaviour.go
	modified:   modules/light-clients/07-tendermint/types/proposal_handle.go
	modified:   modules/light-clients/07-tendermint/types/store.go
	modified:   modules/light-clients/07-tendermint/types/upgrade.go
	modified:   proto/ibc/applications/fee/v1/ack.proto
	modified:   proto/ibc/applications/fee/v1/fee.proto
	modified:   proto/ibc/applications/fee/v1/genesis.proto
	modified:   proto/ibc/applications/fee/v1/metadata.proto
	modified:   proto/ibc/applications/fee/v1/query.proto
	modified:   proto/ibc/applications/fee/v1/tx.proto
	modified:   proto/ibc/applications/interchain_accounts/controller/v1/controller.proto
	modified:   proto/ibc/applications/interchain_accounts/controller/v1/query.proto
	modified:   proto/ibc/applications/interchain_accounts/controller/v1/tx.proto
	modified:   proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto
	modified:   proto/ibc/applications/interchain_accounts/host/v1/host.proto
	modified:   proto/ibc/applications/interchain_accounts/host/v1/query.proto
	modified:   proto/ibc/applications/interchain_accounts/v1/account.proto
	modified:   proto/ibc/applications/interchain_accounts/v1/metadata.proto
	modified:   proto/ibc/applications/interchain_accounts/v1/packet.proto
	modified:   proto/ibc/applications/transfer/v1/genesis.proto
	modified:   proto/ibc/applications/transfer/v1/query.proto
	modified:   proto/ibc/applications/transfer/v1/transfer.proto
	modified:   proto/ibc/applications/transfer/v1/tx.proto
	modified:   proto/ibc/applications/transfer/v2/packet.proto
	modified:   proto/ibc/core/channel/v1/channel.proto
	modified:   proto/ibc/core/channel/v1/genesis.proto
	modified:   proto/ibc/core/channel/v1/query.proto
	modified:   proto/ibc/core/channel/v1/tx.proto
	modified:   proto/ibc/core/client/v1/client.proto
	modified:   proto/ibc/core/client/v1/genesis.proto
	modified:   proto/ibc/core/client/v1/query.proto
	modified:   proto/ibc/core/client/v1/tx.proto
	modified:   proto/ibc/core/commitment/v1/commitment.proto
	modified:   proto/ibc/core/connection/v1/connection.proto
	modified:   proto/ibc/core/connection/v1/genesis.proto
	modified:   proto/ibc/core/connection/v1/query.proto
	modified:   proto/ibc/core/connection/v1/tx.proto
	modified:   proto/ibc/core/types/v1/genesis.proto
	modified:   proto/ibc/lightclients/solomachine/v1/solomachine.proto
	modified:   testing/chain_test.go
	modified:   testing/events.go
	modified:   testing/mock/ibc_app.go
	modified:   testing/mock/ibc_module.go
	modified:   testing/mock/ibc_module_test.go
	modified:   testing/mock/mock.go
	modified:   testing/mock/privval_test.go
	modified:   testing/path.go
	modified:   testing/simapp/ante_handler.go
	modified:   testing/simapp/encoding.go
	modified:   testing/simapp/genesis_account_test.go
	modified:   testing/simapp/sim_bench_test.go
	modified:   testing/simapp/sim_test.go
	modified:   testing/simapp/simd/cmd/cmd_test.go
	modified:   testing/simapp/simd/cmd/genaccounts_test.go
	modified:   testing/simapp/simd/cmd/root.go
	modified:   testing/simapp/simd/main.go
	modified:   testing/simapp/state.go
	modified:   testing/simapp/test_helpers.go
	modified:   testing/simapp/utils.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go
	both modified:   modules/core/02-client/abci.go
	both modified:   modules/core/02-client/abci_test.go
	both modified:   modules/core/02-client/client/utils/utils.go
	both modified:   modules/core/02-client/keeper/client_test.go
	both modified:   modules/core/02-client/keeper/grpc_query_test.go
	both modified:   modules/core/02-client/keeper/keeper.go
	both modified:   modules/core/02-client/keeper/keeper_test.go
	both modified:   modules/core/02-client/keeper/proposal_test.go
	both modified:   modules/core/02-client/legacy/v100/genesis.go
	both modified:   modules/core/02-client/legacy/v100/genesis_test.go
	both modified:   modules/core/02-client/legacy/v100/store.go
	both modified:   modules/core/02-client/legacy/v100/store_test.go
	both modified:   modules/core/02-client/proposal_handler_test.go
	both modified:   modules/core/02-client/simulation/decoder_test.go
	both modified:   modules/core/02-client/types/codec_test.go
	both modified:   modules/core/02-client/types/encoding_test.go
	both modified:   modules/core/02-client/types/genesis_test.go
	both modified:   modules/core/02-client/types/msgs_test.go
	both modified:   modules/core/02-client/types/proposal_test.go
	both modified:   modules/core/02-client/types/tx.pb.go
	both modified:   modules/core/03-connection/keeper/handshake_test.go
	both modified:   modules/core/03-connection/keeper/keeper_test.go
	both modified:   modules/core/03-connection/keeper/verify.go
	both modified:   modules/core/03-connection/keeper/verify_test.go
	both modified:   modules/core/03-connection/types/msgs_test.go
	both modified:   modules/core/04-channel/keeper/packet_test.go
	both modified:   modules/core/genesis_test.go
	both modified:   modules/core/keeper/msg_server_test.go
	both modified:   modules/core/legacy/v100/genesis_test.go
	deleted by us:   modules/core/migrations/v5/migrations.go
	deleted by us:   modules/core/migrations/v5/migrations_test.go
	both modified:   modules/core/simulation/decoder_test.go
	both modified:   modules/core/types/codec.go
	deleted by us:   modules/light-clients/06-solomachine/client_state.go
	deleted by us:   modules/light-clients/06-solomachine/client_state_test.go
	deleted by us:   modules/light-clients/06-solomachine/codec.go
	deleted by us:   modules/light-clients/06-solomachine/misbehaviour_handle.go
	deleted by us:   modules/light-clients/06-solomachine/proof_test.go
	deleted by us:   modules/light-clients/06-solomachine/proposal_handle_test.go
	deleted by us:   modules/light-clients/06-solomachine/solomachine.pb.go
	both modified:   modules/light-clients/06-solomachine/types/consensus_state_test.go
	both modified:   modules/light-clients/06-solomachine/types/header_test.go
	both modified:   modules/light-clients/06-solomachine/types/misbehaviour_test.go
	both modified:   modules/light-clients/06-solomachine/types/solomachine.pb.go
	both modified:   modules/light-clients/06-solomachine/types/solomachine_test.go
	deleted by us:   modules/light-clients/06-solomachine/update.go
	deleted by us:   modules/light-clients/06-solomachine/update_test.go
	deleted by us:   modules/light-clients/07-tendermint/client_state.go
	deleted by us:   modules/light-clients/07-tendermint/client_state_test.go
	deleted by us:   modules/light-clients/07-tendermint/misbehaviour_handle_test.go
	both modified:   modules/light-clients/07-tendermint/types/consensus_state_test.go
	both modified:   modules/light-clients/07-tendermint/types/genesis_test.go
	both modified:   modules/light-clients/07-tendermint/types/header_test.go
	both modified:   modules/light-clients/07-tendermint/types/misbehaviour_handle.go
	both modified:   modules/light-clients/07-tendermint/types/misbehaviour_test.go
	both modified:   modules/light-clients/07-tendermint/types/proposal_handle_test.go
	both modified:   modules/light-clients/07-tendermint/types/store_test.go
	both modified:   modules/light-clients/07-tendermint/types/tendermint.pb.go
	both modified:   modules/light-clients/07-tendermint/types/tendermint_test.go
	both modified:   modules/light-clients/07-tendermint/types/update.go
	both modified:   modules/light-clients/07-tendermint/types/upgrade_test.go
	deleted by us:   modules/light-clients/07-tendermint/update_test.go
	both modified:   proto/ibc/lightclients/solomachine/v2/solomachine.proto
	deleted by us:   proto/ibc/lightclients/solomachine/v3/solomachine.proto
	both modified:   proto/ibc/lightclients/tendermint/v1/tendermint.proto
	both modified:   testing/README.md
	both modified:   testing/app.go
	both modified:   testing/chain.go
	both modified:   testing/config.go
	both modified:   testing/endpoint.go
	both modified:   testing/simapp/app.go
	both modified:   testing/solomachine.go
	both modified:   testing/values.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* bumpbing go mod to v6

* removing stale test file

(cherry picked from commit c86d27f)

# Conflicts:
#	modules/apps/27-interchain-accounts/controller/keeper/msg_server_test.go
#	modules/core/02-client/abci.go
#	modules/core/02-client/abci_test.go
#	modules/core/02-client/client/utils/utils.go
#	modules/core/02-client/keeper/client_test.go
#	modules/core/02-client/keeper/grpc_query_test.go
#	modules/core/02-client/keeper/keeper.go
#	modules/core/02-client/keeper/keeper_test.go
#	modules/core/02-client/keeper/proposal_test.go
#	modules/core/02-client/legacy/v100/genesis.go
#	modules/core/02-client/legacy/v100/genesis_test.go
#	modules/core/02-client/legacy/v100/store.go
#	modules/core/02-client/legacy/v100/store_test.go
#	modules/core/02-client/proposal_handler_test.go
#	modules/core/02-client/simulation/decoder_test.go
#	modules/core/02-client/types/codec_test.go
#	modules/core/02-client/types/encoding_test.go
#	modules/core/02-client/types/genesis_test.go
#	modules/core/02-client/types/msgs_test.go
#	modules/core/02-client/types/proposal_test.go
#	modules/core/02-client/types/tx.pb.go
#	modules/core/03-connection/keeper/handshake_test.go
#	modules/core/03-connection/keeper/keeper_test.go
#	modules/core/03-connection/keeper/verify.go
#	modules/core/03-connection/keeper/verify_test.go
#	modules/core/03-connection/types/msgs_test.go
#	modules/core/04-channel/keeper/packet_test.go
#	modules/core/genesis_test.go
#	modules/core/keeper/msg_server_test.go
#	modules/core/legacy/v100/genesis_test.go
#	modules/core/migrations/v5/migrations.go
#	modules/core/migrations/v5/migrations_test.go
#	modules/core/simulation/decoder_test.go
#	modules/core/types/codec.go
#	modules/light-clients/06-solomachine/client_state.go
#	modules/light-clients/06-solomachine/client_state_test.go
#	modules/light-clients/06-solomachine/codec.go
#	modules/light-clients/06-solomachine/misbehaviour_handle.go
#	modules/light-clients/06-solomachine/proof_test.go
#	modules/light-clients/06-solomachine/proposal_handle_test.go
#	modules/light-clients/06-solomachine/solomachine.pb.go
#	modules/light-clients/06-solomachine/types/consensus_state_test.go
#	modules/light-clients/06-solomachine/types/header_test.go
#	modules/light-clients/06-solomachine/types/misbehaviour_test.go
#	modules/light-clients/06-solomachine/types/solomachine.pb.go
#	modules/light-clients/06-solomachine/types/solomachine_test.go
#	modules/light-clients/06-solomachine/update.go
#	modules/light-clients/06-solomachine/update_test.go
#	modules/light-clients/07-tendermint/client_state.go
#	modules/light-clients/07-tendermint/client_state_test.go
#	modules/light-clients/07-tendermint/misbehaviour_handle_test.go
#	modules/light-clients/07-tendermint/types/consensus_state_test.go
#	modules/light-clients/07-tendermint/types/genesis_test.go
#	modules/light-clients/07-tendermint/types/header_test.go
#	modules/light-clients/07-tendermint/types/misbehaviour_handle.go
#	modules/light-clients/07-tendermint/types/misbehaviour_test.go
#	modules/light-clients/07-tendermint/types/proposal_handle_test.go
#	modules/light-clients/07-tendermint/types/store_test.go
#	modules/light-clients/07-tendermint/types/tendermint.pb.go
#	modules/light-clients/07-tendermint/types/tendermint_test.go
#	modules/light-clients/07-tendermint/types/update.go
#	modules/light-clients/07-tendermint/types/upgrade_test.go
#	modules/light-clients/07-tendermint/update_test.go
#	proto/ibc/lightclients/solomachine/v2/solomachine.proto
#	proto/ibc/lightclients/solomachine/v3/solomachine.proto
#	proto/ibc/lightclients/tendermint/v1/tendermint.proto
#	testing/README.md
#	testing/app.go
#	testing/chain.go
#	testing/config.go
#	testing/endpoint.go
#	testing/simapp/app.go
#	testing/solomachine.go
#	testing/values.go
@damiannolan
Copy link
Member

will handle conflicts on this backport

Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @damiannolan !

@damiannolan damiannolan enabled auto-merge (squash) September 26, 2022 15:01
Copy link
Contributor

@crodriguezvega crodriguezvega left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the most exciting work, so thanks a lot for doing this, @damiannolan!

@damiannolan damiannolan merged commit edb6efa into release/v6.0.x Sep 26, 2022
@damiannolan damiannolan deleted the mergify/bp/release/v6.0.x/pr-2318 branch September 26, 2022 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants