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

feat(docs): rename x/builder -> x/auction (backport #55) #88

Merged
merged 2 commits into from
Sep 20, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 12, 2023

This is an automatic backport of pull request #55 done by Mergify.
Cherry-pick of 3c6f319 has failed:

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

You are currently cherry-picking commit 3c6f319.
  (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:
	renamed:    api/sdk/builder/module/v1/module.pulsar.go -> api/sdk/auction/module/v1/module.pulsar.go
	renamed:    api/sdk/builder/v1/genesis.pulsar.go -> api/sdk/auction/v1/genesis.pulsar.go
	renamed:    api/sdk/builder/v1/query.pulsar.go -> api/sdk/auction/v1/query.pulsar.go
	renamed:    api/sdk/builder/v1/query_grpc.pb.go -> api/sdk/auction/v1/query_grpc.pb.go
	renamed:    api/sdk/builder/v1/tx.pulsar.go -> api/sdk/auction/v1/tx.pulsar.go
	renamed:    api/sdk/builder/v1/tx_grpc.pb.go -> api/sdk/auction/v1/tx_grpc.pb.go
	modified:   lanes/mev/README.md
	modified:   lanes/mev/abci.go
	modified:   lanes/mev/factory.go
	modified:   lanes/mev/lane.go
	modified:   lanes/mev/mempool.go
	renamed:    proto/sdk/builder/module/v1/module.proto -> proto/sdk/auction/module/v1/module.proto
	renamed:    proto/sdk/builder/v1/genesis.proto -> proto/sdk/auction/v1/genesis.proto
	renamed:    proto/sdk/builder/v1/query.proto -> proto/sdk/auction/v1/query.proto
	renamed:    proto/sdk/builder/v1/tx.proto -> proto/sdk/auction/v1/tx.proto
	modified:   tests/app/ante.go
	modified:   tests/integration/pob_suite.go
	renamed:    x/builder/keeper/auction_test.go -> x/auction/keeper/auction_test.go
	renamed:    x/builder/keeper/errors.go -> x/auction/keeper/errors.go
	renamed:    x/builder/keeper/keeper_test.go -> x/auction/keeper/keeper_test.go
	renamed:    x/builder/keeper/msg_server_test.go -> x/auction/keeper/msg_server_test.go
	renamed:    x/builder/rewards/proposer_provider.go -> x/auction/rewards/proposer_provider.go
	renamed:    x/builder/types/bid_info.go -> x/auction/types/bid_info.go
	renamed:    x/builder/types/codec.go -> x/auction/types/codec.go
	renamed:    x/builder/types/events.go -> x/auction/types/events.go
	renamed:    x/builder/types/expected_keepers.go -> x/auction/types/expected_keepers.go
	renamed:    x/builder/types/genesis.go -> x/auction/types/genesis.go
	renamed:    x/builder/types/genesis.pb.go -> x/auction/types/genesis.pb.go
	new file:   x/auction/types/keys.go
	renamed:    x/builder/types/msgs.go -> x/auction/types/msgs.go
	renamed:    x/builder/types/params.go -> x/auction/types/params.go
	renamed:    x/builder/types/query.pb.go -> x/auction/types/query.pb.go
	renamed:    x/builder/types/query.pb.gw.go -> x/auction/types/query.pb.gw.go
	renamed:    x/builder/types/tx.pb.go -> x/auction/types/tx.pb.go
	renamed:    x/builder/types/tx.pb.gw.go -> x/auction/types/tx.pb.gw.go
	deleted:    x/builder/ante/ante.go
	deleted:    x/builder/ante/ante_test.go
	deleted:    x/builder/client/cli/query.go
	deleted:    x/builder/client/cli/tx.go
	deleted:    x/builder/keeper/auction.go
	deleted:    x/builder/keeper/genesis.go
	deleted:    x/builder/keeper/grpc_query.go
	deleted:    x/builder/keeper/keeper.go
	deleted:    x/builder/keeper/msg_server.go
	deleted:    x/builder/module.go
	deleted:    x/builder/rewards/fixed_provider.go
	deleted:    x/builder/types/keys.go
	deleted:    x/builder/types/msgs_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   block/mempool_test.go
	both modified:   lanes/mev/check_tx.go
	both modified:   lanes/mev/utils.go
	both modified:   lanes/mev/utils_test.go
	both modified:   tests/app/app.go
	both modified:   tests/app/config.go
	both modified:   tests/integration/chain_setup.go
	both modified:   tests/integration/pob_integration_test.go
	both modified:   testutils/utils.go
	both modified:   x/auction/ante/ante.go
	both modified:   x/auction/ante/ante_test.go
	both modified:   x/auction/client/cli/query.go
	both modified:   x/auction/client/cli/tx.go
	both modified:   x/auction/keeper/auction.go
	both modified:   x/auction/keeper/genesis.go
	both modified:   x/auction/keeper/grpc_query.go
	both modified:   x/auction/keeper/keeper.go
	both modified:   x/auction/keeper/msg_server.go
	both modified:   x/auction/module.go
	both modified:   x/auction/rewards/fixed_provider.go
	both modified:   x/auction/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

@mergify mergify bot added the conflicts label Sep 12, 2023
Copy link
Contributor

@nivasan1 nivasan1 left a comment

Choose a reason for hiding this comment

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

lgtm

* rename x/builder -> x/auction

* update proto / etc.

* integratino fix

---------

Co-authored-by: David Terpay <david.terpay@gmail.com>
(cherry picked from commit 3c6f319)

# Conflicts:
#	block/mempool_test.go
#	lanes/mev/check_tx.go
#	lanes/mev/utils.go
#	lanes/mev/utils_test.go
#	tests/app/app.go
#	tests/app/config.go
#	tests/integration/chain_setup.go
#	tests/integration/pob_integration_test.go
#	testutils/utils.go
#	x/auction/ante/ante.go
#	x/auction/ante/ante_test.go
#	x/auction/client/cli/query.go
#	x/auction/client/cli/tx.go
#	x/auction/keeper/auction.go
#	x/auction/keeper/genesis.go
#	x/auction/keeper/grpc_query.go
#	x/auction/keeper/keeper.go
#	x/auction/keeper/msg_server.go
#	x/auction/module.go
#	x/auction/rewards/fixed_provider.go
#	x/auction/types/msgs_test.go
@davidterpay davidterpay enabled auto-merge (squash) September 20, 2023 16:30
@nivasan1 nivasan1 force-pushed the mergify/bp/release/v1.x.x/pr-55 branch from 2d703ee to 4fcee09 Compare September 20, 2023 16:30
@davidterpay davidterpay merged commit 84ef6e9 into release/v1.x.x Sep 20, 2023
4 of 7 checks passed
@davidterpay davidterpay deleted the mergify/bp/release/v1.x.x/pr-55 branch September 20, 2023 16:30
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.

2 participants