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

build(all): migrate to go.uber.org/mock (backport #22315) #22318

Closed
wants to merge 1 commit into from
Closed

build(all): migrate to go.uber.org/mock (backport #22315) #22318

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2024

Description

#22313

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title, you can find examples of the prefixes below:

  • confirmed ! in the type prefix if API or client breaking change

  • targeted the correct branch (see PR Targeting)

  • provided a link to the relevant issue or specification

  • reviewed "Files changed" and left comments if necessary

  • included the necessary unit and integration tests

  • added a changelog entry to CHANGELOG.md

  • updated the relevant documentation or specification, including comments for documenting Go code

  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage
This is an automatic backport of pull request #22315 done by [Mergify](https://mergify.com).

@islishude @mergify
build(all): migrate to go.uber.org/mock (#22315)
247f665 
(cherry picked from commit fc91e76)

# Conflicts:
#	baseapp/abci_test.go
#	client/v2/go.mod
#	client/v2/go.sum
#	core/testing/gas/service_mocks.go
#	core/testing/go.mod
#	core/testing/go.sum
#	go.mod
#	go.sum
#	orm/go.mod
#	orm/go.sum
#	orm/model/ormdb/module_test.go
#	orm/testing/ormmocks/hooks.go
#	orm/testing/ormmocks/match.go
#	server/v2/cometbft/go.mod
#	server/v2/cometbft/go.sum
#	simapp/go.mod
#	simapp/go.sum
#	simapp/v2/go.mod
#	simapp/v2/go.sum
#	tests/go.mod
#	tests/go.sum
#	tools/confix/go.mod
#	tools/confix/go.sum
#	x/accounts/defaults/base/go.mod
#	x/accounts/defaults/base/go.sum
#	x/accounts/defaults/lockup/go.sum
#	x/accounts/defaults/multisig/go.mod
#	x/accounts/defaults/multisig/go.sum
#	x/accounts/go.mod
#	x/accounts/go.sum
#	x/authz/go.mod
#	x/authz/go.sum
#	x/bank/go.mod
#	x/bank/go.sum
#	x/bank/v2/testutil/expected_keepers_mocks.go
#	x/circuit/go.mod
#	x/circuit/go.sum
#	x/consensus/go.mod
#	x/consensus/go.sum
#	x/distribution/go.mod
#	x/distribution/go.sum
#	x/epochs/go.mod
#	x/epochs/go.sum
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/feegrant/go.mod
#	x/feegrant/go.sum
#	x/gov/go.mod
#	x/gov/go.sum
#	x/group/go.mod
#	x/group/go.sum
#	x/mint/go.mod
#	x/mint/go.sum
#	x/nft/go.mod
#	x/nft/go.sum
#	x/params/go.mod
#	x/params/go.sum
#	x/protocolpool/go.mod
#	x/protocolpool/go.sum
#	x/slashing/go.mod
#	x/slashing/go.sum
#	x/staking/go.mod
#	x/staking/go.sum
#	x/upgrade/go.mod
#	x/upgrade/go.sum
@mergify mergify bot requested a review from a team as a code owner October 21, 2024 10:06
@mergify mergify bot added the conflicts label Oct 21, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 21, 2024

Cherry-pick of fc91e76 has failed:

On branch mergify/bp/release/v0.52.x/pr-22315
Your branch is up to date with 'origin/release/v0.52.x'.

You are currently cherry-picking commit fc91e7635.
  (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:   baseapp/abci_utils_test.go
	modified:   baseapp/testutil/mock/mocks.go
	modified:   scripts/build/build.mk
	modified:   simapp/app_test.go
	modified:   tests/integration/bank/keeper/deterministic_test.go
	modified:   tests/integration/distribution/keeper/msg_server_test.go
	modified:   tests/integration/distribution/migration_v4_test.go
	modified:   tests/integration/evidence/keeper/infraction_test.go
	modified:   tests/integration/example/example_test.go
	modified:   tests/integration/gov/keeper/keeper_test.go
	modified:   tests/integration/slashing/keeper/keeper_test.go
	modified:   tests/integration/staking/keeper/common_test.go
	modified:   tests/integration/staking/keeper/deterministic_test.go
	modified:   tests/integration/staking/keeper/unbonding_test.go
	modified:   testutil/mock/account_retriever.go
	modified:   testutil/mock/grpc_server.go
	modified:   testutil/mock/logger.go
	modified:   testutil/mock/types_handler.go
	modified:   testutil/mock/types_invariant.go
	modified:   testutil/mock/types_mock_appmodule.go
	modified:   testutil/mock/types_module_module.go
	modified:   testutil/x/counter/testutil/expected_keepers_mocks.go
	modified:   types/context_test.go
	modified:   types/handler_test.go
	modified:   types/module/module_test.go
	modified:   x/accounts/defaults/base/utils_test.go
	modified:   x/auth/ante/ante_test.go
	modified:   x/auth/ante/fee_test.go
	modified:   x/auth/ante/feegrant_test.go
	modified:   x/auth/ante/testutil/expected_keepers_mocks.go
	modified:   x/auth/ante/testutil_test.go
	modified:   x/auth/keeper/deterministic_test.go
	modified:   x/auth/keeper/grpc_query_test.go
	modified:   x/auth/keeper/keeper_test.go
	modified:   x/auth/keeper/msg_server_test.go
	modified:   x/auth/testutil/expected_keepers_mocks.go
	modified:   x/auth/tx/testutil/expected_keepers_mocks.go
	modified:   x/auth/vesting/testutil/expected_keepers_mocks.go
	modified:   x/auth/vesting/types/vesting_account_test.go
	modified:   x/authz/keeper/keeper_test.go
	modified:   x/authz/testutil/expected_keepers_mocks.go
	modified:   x/bank/keeper/collections_test.go
	modified:   x/bank/keeper/keeper_test.go
	modified:   x/bank/testutil/expected_keepers_mocks.go
	modified:   x/distribution/keeper/allocation_test.go
	modified:   x/distribution/keeper/delegation_test.go
	modified:   x/distribution/keeper/grpc_query_test.go
	modified:   x/distribution/keeper/keeper_test.go
	modified:   x/distribution/keeper/msg_server_test.go
	modified:   x/distribution/testutil/expected_keepers_mocks.go
	modified:   x/evidence/keeper/keeper_test.go
	modified:   x/evidence/testutil/expected_keepers_mocks.go
	modified:   x/feegrant/testutil/expected_keepers_mocks.go
	modified:   x/genutil/gentx_test.go
	modified:   x/genutil/testutil/expected_keepers_mocks.go
	modified:   x/gov/keeper/common_test.go
	modified:   x/gov/keeper/tally_test.go
	modified:   x/gov/testutil/expected_keepers_mocks.go
	modified:   x/group/keeper/genesis_test.go
	modified:   x/group/keeper/grpc_query_test.go
	modified:   x/group/keeper/keeper_test.go
	modified:   x/group/keeper/msg_server_test.go
	modified:   x/group/migrations/v2/migrate_test.go
	modified:   x/group/testutil/expected_keepers_mocks.go
	modified:   x/mint/keeper/genesis_test.go
	modified:   x/mint/keeper/grpc_query_test.go
	modified:   x/mint/keeper/keeper_test.go
	modified:   x/mint/module_test.go
	modified:   x/mint/testutil/expected_keepers_mocks.go
	modified:   x/nft/keeper/keeper_test.go
	modified:   x/nft/testutil/expected_keepers_mocks.go
	modified:   x/params/testutil/staking_keeper_mock.go
	modified:   x/protocolpool/keeper/keeper_test.go
	modified:   x/protocolpool/keeper/msg_server_test.go
	modified:   x/protocolpool/testutil/expected_keepers_mocks.go
	modified:   x/slashing/keeper/genesis_test.go
	modified:   x/slashing/keeper/keeper_test.go
	modified:   x/slashing/keeper/signing_info_test.go
	modified:   x/slashing/testutil/expected_keepers_mocks.go
	modified:   x/staking/keeper/cons_pubkey_test.go
	modified:   x/staking/keeper/delegation_test.go
	modified:   x/staking/keeper/keeper_test.go
	modified:   x/staking/keeper/msg_server_test.go
	modified:   x/staking/keeper/validator_test.go
	modified:   x/staking/testutil/expected_keepers_mocks.go
	modified:   x/upgrade/keeper/abci_test.go
	modified:   x/upgrade/keeper/grpc_query_test.go
	modified:   x/upgrade/keeper/keeper_test.go
	modified:   x/upgrade/testutil/expected_keepers_mocks.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   baseapp/abci_test.go
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum
	deleted by us:   core/testing/gas/service_mocks.go
	deleted by us:   core/testing/go.mod
	deleted by us:   core/testing/go.sum
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   orm/go.mod
	deleted by us:   orm/go.sum
	deleted by us:   orm/model/ormdb/module_test.go
	deleted by us:   orm/testing/ormmocks/hooks.go
	deleted by us:   orm/testing/ormmocks/match.go
	both modified:   server/v2/cometbft/go.mod
	both modified:   server/v2/cometbft/go.sum
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	both modified:   simapp/v2/go.mod
	both modified:   simapp/v2/go.sum
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	both modified:   tools/confix/go.mod
	both modified:   tools/confix/go.sum
	both modified:   x/accounts/defaults/base/go.mod
	both modified:   x/accounts/defaults/base/go.sum
	both modified:   x/accounts/defaults/lockup/go.sum
	both modified:   x/accounts/defaults/multisig/go.mod
	both modified:   x/accounts/defaults/multisig/go.sum
	both modified:   x/accounts/go.mod
	both modified:   x/accounts/go.sum
	both modified:   x/authz/go.mod
	both modified:   x/authz/go.sum
	both modified:   x/bank/go.mod
	both modified:   x/bank/go.sum
	deleted by us:   x/bank/v2/testutil/expected_keepers_mocks.go
	both modified:   x/circuit/go.mod
	both modified:   x/circuit/go.sum
	both modified:   x/consensus/go.mod
	both modified:   x/consensus/go.sum
	both modified:   x/distribution/go.mod
	both modified:   x/distribution/go.sum
	both modified:   x/epochs/go.mod
	both modified:   x/epochs/go.sum
	both modified:   x/evidence/go.mod
	both modified:   x/evidence/go.sum
	both modified:   x/feegrant/go.mod
	both modified:   x/feegrant/go.sum
	both modified:   x/gov/go.mod
	both modified:   x/gov/go.sum
	both modified:   x/group/go.mod
	both modified:   x/group/go.sum
	both modified:   x/mint/go.mod
	both modified:   x/mint/go.sum
	both modified:   x/nft/go.mod
	both modified:   x/nft/go.sum
	both modified:   x/params/go.mod
	both modified:   x/params/go.sum
	both modified:   x/protocolpool/go.mod
	both modified:   x/protocolpool/go.sum
	both modified:   x/slashing/go.mod
	both modified:   x/slashing/go.sum
	both modified:   x/staking/go.mod
	both modified:   x/staking/go.sum
	both modified:   x/upgrade/go.mod
	both modified:   x/upgrade/go.sum

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

@mergify mergify bot mentioned this pull request Oct 21, 2024
Merged
12 tasks
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 21, 2024
View reviewed changes
core/testing/gas/service_mocks.go

import (
context "context"
reflect "reflect"

Check notice

Code scanning / CodeQL

Sensitive package import Note test

Certain system packages contain functions which may be a possible source of non-determinism
orm/testing/ormmocks/hooks.go

import (
context "context"
reflect "reflect"

Check notice

Code scanning / CodeQL

Sensitive package import Note test

Certain system packages contain functions which may be a possible source of non-determinism
@tac0turtle
Copy link
Member

does this need to be backported?

@tac0turtle tac0turtle closed this Oct 21, 2024
@kocubinski
Copy link
Member

looks like this is required by #22457

@kocubinski kocubinski reopened this Nov 7, 2024
@kocubinski
Copy link
Member

cancel above.. working around this in 0.52

@kocubinski kocubinski closed this Nov 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C:CLI C:Confix Issues and PR related to Confix C:core/testing C:orm C:server/v2 cometbft C:server/v2 Issues related to server/v2 C:x/accounts/base C:x/accounts/lockup C:x/accounts/multisig C:x/accounts C:x/auth C:x/authz C:x/bank C:x/circuit C:x/consensus C:x/distribution distribution module related C:x/epochs C:x/evidence C:x/feegrant C:x/genutil genutil module issues C:x/gov C:x/group C:x/mint C:x/nft C:x/params C:x/protocolpool C:x/slashing C:x/staking C:x/upgrade conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tac0turtle @kocubinski @islishude