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.

Sign up for GitHub

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

Jump to bottom

chore: increment go mod to v6 #2318

Merged
merged 4 commits into from
Sep 21, 2022
Merged

chore: increment go mod to v6 #2318

merged 4 commits into from
Sep 21, 2022

Conversation

damiannolan
Copy link
Member

Description

  • Updating go.mod to ibc-go/v6

closes: #2011

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer
  • Review Codecov Report in the comment section below once CI passes

chatton
chatton approved these changes Sep 20, 2022
View reviewed changes
Copy link
Contributor

@chatton chatton left a comment

Choose a reason for hiding this comment

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

LGTM once all the tests are passing 🥇

crodriguezvega
crodriguezvega approved these changes Sep 20, 2022
View reviewed changes
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.

Awesome!

colin-axner
colin-axner reviewed Sep 21, 2022
View reviewed changes
modules/apps/27-interchain-accounts/host/keeper/account_test.go Outdated
@@ -0,0 +1,33 @@
package keeper_test
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this from a merge conflict?

Copy link
Member Author

Choose a reason for hiding this comment

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

do you mean the entire test file?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yea. Why was the test file added for a version bump pr?

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like I cut this branch before the PR which removed this. So when I pulled in the latest changes this file was kept.

I'll push an update to remove now. Good catch! :)

@damiannolan damiannolan enabled auto-merge (squash) September 21, 2022 15:41
@damiannolan damiannolan merged commit c86d27f into main Sep 21, 2022
@damiannolan damiannolan deleted the damian/v6-mod-bump branch September 21, 2022 15:43
mergify bot pushed a commit that referenced this pull request Sep 21, 2022
@damiannolan @mergify
chore: increment go mod to v6 (#2318)
d33ee8e 
* 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
@mergify mergify bot mentioned this pull request Sep 21, 2022
Merged
damiannolan added a commit that referenced this pull request Sep 26, 2022
@mergify @damiannolan
chore: increment go mod to v6 (backport #2318) (#2364)
edb6efa 
* chore: increment go mod to v6 (#2318)

* 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

* resolving conflicts

* revert e2e changes

* removing unnecessary future migration code

Co-authored-by: Damian Nolan <[email protected]>
@chatton chatton mentioned this pull request Nov 7, 2022
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@colin-axner colin-axner colin-axner approved these changes

@chatton chatton chatton approved these changes

@crodriguezvega crodriguezvega crodriguezvega approved these changes

@AdityaSripal AdityaSripal Awaiting requested review from AdityaSripal AdityaSripal is a code owner

@seantking seantking Awaiting requested review from seantking

@charleenfei charleenfei Awaiting requested review from charleenfei

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bump package to v6
4 participants
@damiannolan @crodriguezvega @chatton @colin-axner