Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

chore: Upgrade module path for v2 (backport #383) #388

Merged
merged 4 commits into from
Jan 24, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 24, 2024

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

On branch mergify/bp/release/v2.x.x/pr-383
Your branch is up to date with 'origin/release/v2.x.x'.

You are currently cherry-picking commit acff9d0.
  (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:   abci/abci.go
	modified:   abci/checktx/mempool_parity_check_tx.go
	modified:   abci/checktx/mev_check_tx.go
	modified:   abci/utils.go
	modified:   adapters/signer_extraction_adapter/signer_extraction_adapter_test.go
	modified:   block/base/abci.go
	modified:   block/base/config.go
	modified:   block/base/lane.go
	modified:   block/base/mempool.go
	modified:   block/base/options.go
	modified:   block/base/priority_nonce.go
	modified:   block/base/proposals.go
	modified:   block/base/tx_info.go
	modified:   block/base/types.go
	modified:   block/lane.go
	modified:   block/mocks/lane.go
	modified:   block/mocks/lane_mempool.go
	modified:   block/proposals/proposals.go
	modified:   block/proposals/proposals_test.go
	modified:   block/proposals/update.go
	modified:   block/service/service.go
	modified:   block/service/service_test.go
	modified:   block/types.go
	modified:   block/utils/utils.go
	modified:   go.mod
	modified:   lanes/base/abci_test.go
	modified:   lanes/base/base_test.go
	modified:   lanes/base/lane.go
	modified:   lanes/base/mempool_test.go
	modified:   lanes/base/tx_info_test.go
	modified:   lanes/free/lane.go
	modified:   lanes/mev/abci.go
	modified:   lanes/mev/abci_test.go
	modified:   lanes/mev/factory.go
	modified:   lanes/mev/factory_test.go
	modified:   lanes/mev/lane.go
	modified:   lanes/mev/mempool.go
	modified:   lanes/mev/mev_test.go
	modified:   lanes/mev/testutils/testutil.go
	modified:   lanes/mev/utils.go
	modified:   lanes/mev/utils_test.go
	modified:   lanes/terminator/lane.go
	modified:   tests/app/ante.go
	modified:   tests/app/lanes.go
	modified:   tests/app/testappd/cmd/root.go
	modified:   tests/app/testappd/cmd/testnet.go
	modified:   tests/app/testappd/main.go
	modified:   tests/e2e/block_sdk_suite.go
	modified:   tests/e2e/chain_setup.go
	modified:   tests/e2e/go.sum
	modified:   tests/integration/network/mempool_test.go
	modified:   testutils/utils.go
	modified:   x/auction/ante/utils.go
	modified:   x/auction/client/cli/query.go
	modified:   x/auction/client/cli/tx.go
	modified:   x/auction/keeper/auction.go
	modified:   x/auction/keeper/auction_test.go
	modified:   x/auction/keeper/genesis.go
	modified:   x/auction/keeper/grpc_query.go
	modified:   x/auction/keeper/grpc_query_test.go
	modified:   x/auction/keeper/keeper.go
	modified:   x/auction/keeper/keeper_test.go
	modified:   x/auction/keeper/msg_server.go
	modified:   x/auction/keeper/msg_server_test.go
	modified:   x/auction/module.go
	modified:   x/auction/rewards/fixed_provider.go
	modified:   x/auction/rewards/proposer_provider.go
	modified:   x/auction/types/mocks/account_keeper.go
	modified:   x/auction/types/mocks/bank_keeper.go
	modified:   x/auction/types/mocks/distribution_keeper.go
	modified:   x/auction/types/mocks/rewards_address_provider.go
	modified:   x/auction/types/mocks/staking_keeper.go
	modified:   x/auction/types/msgs_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   abci/abci_test.go
	both modified:   abci/checktx/check_tx_test.go
	both modified:   abci/utils_test.go
	both modified:   block/base/mempool_test.go
	both modified:   block/base/tx_priority_test.go
	deleted by us:   block/lane_test.go
	both modified:   block/mempool.go
	both modified:   block/mempool_test.go
	deleted by us:   block/mocks/lane_fetcher.go
	both modified:   tests/app/app.go
	both modified:   tests/app/config.go
	both modified:   tests/e2e/block_sdk_e2e_test.go
	both modified:   tests/e2e/go.mod
	both modified:   tests/integration/integration_test.go
	deleted by us:   tests/integration/network/auction_test.go
	both modified:   tests/integration/network/network_test.go
	both modified:   testutils/keeper/keeper.go
	both modified:   testutils/mempool/mempool.go
	both modified:   testutils/networksuite/networksuite.go
	deleted by us:   x/blocksdk/client/cli/query.go
	deleted by us:   x/blocksdk/client/cli/tx.go
	deleted by us:   x/blocksdk/keeper/genesis.go
	deleted by us:   x/blocksdk/keeper/grpc_query.go
	deleted by us:   x/blocksdk/keeper/grpc_query_test.go
	deleted by us:   x/blocksdk/keeper/keeper.go
	deleted by us:   x/blocksdk/keeper/keeper_test.go
	deleted by us:   x/blocksdk/keeper/msg_server.go
	deleted by us:   x/blocksdk/keeper/msg_server_test.go
	deleted by us:   x/blocksdk/module.go
	deleted by us:   x/blocksdk/types/lane_test.go
	deleted by us:   x/blocksdk/types/msgs_test.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

(cherry picked from commit acff9d0)

# Conflicts:
#	abci/abci_test.go
#	abci/checktx/check_tx_test.go
#	abci/utils_test.go
#	block/base/mempool_test.go
#	block/base/tx_priority_test.go
#	block/lane_test.go
#	block/mempool.go
#	block/mempool_test.go
#	block/mocks/lane_fetcher.go
#	tests/app/app.go
#	tests/app/config.go
#	tests/e2e/block_sdk_e2e_test.go
#	tests/e2e/go.mod
#	tests/integration/integration_test.go
#	tests/integration/network/auction_test.go
#	tests/integration/network/network_test.go
#	testutils/keeper/keeper.go
#	testutils/mempool/mempool.go
#	testutils/networksuite/networksuite.go
#	x/blocksdk/client/cli/query.go
#	x/blocksdk/client/cli/tx.go
#	x/blocksdk/keeper/genesis.go
#	x/blocksdk/keeper/grpc_query.go
#	x/blocksdk/keeper/grpc_query_test.go
#	x/blocksdk/keeper/keeper.go
#	x/blocksdk/keeper/keeper_test.go
#	x/blocksdk/keeper/msg_server.go
#	x/blocksdk/keeper/msg_server_test.go
#	x/blocksdk/module.go
#	x/blocksdk/types/lane_test.go
#	x/blocksdk/types/msgs_test.go
@mergify mergify bot added the conflicts label Jan 24, 2024
Copy link

codecov bot commented Jan 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (release/v2.x.x@23a5451). Click here to learn what that means.

Additional details and impacted files
@@                Coverage Diff                @@
##             release/v2.x.x     #388   +/-   ##
=================================================
  Coverage                  ?   49.71%           
=================================================
  Files                     ?       39           
  Lines                     ?     2120           
  Branches                  ?        0           
=================================================
  Hits                      ?     1054           
  Misses                    ?      976           
  Partials                  ?       90           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Eric-Warehime Eric-Warehime merged commit 98dfd29 into release/v2.x.x Jan 24, 2024
12 checks passed
@Eric-Warehime Eric-Warehime deleted the mergify/bp/release/v2.x.x/pr-383 branch January 24, 2024 23:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants