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: format (backport #38) #39

Closed
wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 7, 2023

This is an automatic backport of pull request #38 done by Mergify.
Cherry-pick of 02b2929 has failed:

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

You are currently cherry-picking commit 02b2929.
  (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:   Makefile
	modified:   abci/abci.go
	modified:   abci/abci_test.go
	modified:   block/base/abci.go
	modified:   block/base/config.go
	modified:   block/base/handlers.go
	modified:   block/base/lane.go
	modified:   block/base/mempool.go
	modified:   block/base/types.go
	modified:   block/mempool_test.go
	modified:   block/utils/mocks/lane.go
	modified:   block/utils/mocks/lane_mempool.go
	modified:   block/utils/utils_test.go
	modified:   go.sum
	modified:   lanes/base/abci_test.go
	modified:   lanes/base/base_test.go
	modified:   lanes/base/mempool_test.go
	modified:   lanes/free/lane.go
	modified:   lanes/mev/abci.go
	modified:   lanes/mev/check_tx.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/utils.go
	modified:   lanes/mev/utils_test.go
	modified:   lanes/terminator/lane.go
	modified:   tests/app/ante.go
	modified:   tests/app/testappd/main.go
	modified:   tests/integration/chain_setup.go
	modified:   tests/integration/pob_integration_test.go
	modified:   x/builder/ante/ante.go
	modified:   x/builder/ante/ante_test.go
	modified:   x/builder/client/cli/query.go
	modified:   x/builder/client/cli/tx.go
	modified:   x/builder/keeper/auction.go
	modified:   x/builder/keeper/auction_test.go
	modified:   x/builder/keeper/genesis.go
	modified:   x/builder/keeper/grpc_query.go
	modified:   x/builder/keeper/keeper.go
	modified:   x/builder/keeper/keeper_test.go
	modified:   x/builder/keeper/msg_server.go
	modified:   x/builder/keeper/msg_server_test.go
	modified:   x/builder/module.go
	modified:   x/builder/rewards/fixed_provider.go
	modified:   x/builder/types/msgs_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   block/proposals.go
	both modified:   go.mod
	both modified:   tests/app/config.go
	both modified:   tests/app/testappd/cmd/root.go
	deleted by us:   tests/app/testappd/cmd/testnet.go
	both modified:   testutils/utils.go
	deleted by us:   tools/tools.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

* setup

* tidy

* format

* final format

---------

Co-authored-by: aljo242 <alex@shmeeload.xyz>
(cherry picked from commit 02b2929)

# Conflicts:
#	block/proposals.go
#	go.mod
#	tests/app/config.go
#	tests/app/testappd/cmd/root.go
#	tests/app/testappd/cmd/testnet.go
#	testutils/utils.go
#	tools/tools.go
@mergify mergify bot added the conflicts label Sep 7, 2023
@davidterpay
Copy link
Contributor

@dependabot rebase

@mergify mergify bot deleted the mergify/bp/release/v1.x.x/pr-38 branch September 11, 2023 20:19
@davidterpay davidterpay restored the mergify/bp/release/v1.x.x/pr-38 branch September 11, 2023 20:32
@davidterpay
Copy link
Contributor

@Mergifyio rebase

@davidterpay davidterpay reopened this Sep 11, 2023
@mergify
Copy link
Author

mergify bot commented Sep 11, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Auto-merging Makefile
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
Auto-merging tools/tools.go
CONFLICT (add/add): Merge conflict in tools/tools.go
error: could not apply 778ecab... chore: format (#38)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 778ecab... chore: format (#38)

@mergify mergify bot deleted the mergify/bp/release/v1.x.x/pr-38 branch September 11, 2023 20:36
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