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

feat: Lane Options (backport #272) #274

Merged
merged 2 commits into from
Dec 6, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 6, 2023

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

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

You are currently cherry-picking commit db58154.
  (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/utils_test.go
	modified:   block/README.md
	modified:   block/base/README.md
	new file:   block/base/match.go
	new file:   block/base/options.go
	renamed:    block/base/handlers.go -> block/base/proposals.go
	modified:   block/lane.go
	modified:   block/proposals/proposals_test.go
	modified:   lanes/base/abci_test.go
	modified:   lanes/base/lane.go
	modified:   lanes/free/lane.go
	modified:   lanes/mev/abci.go
	modified:   lanes/mev/abci_test.go
	modified:   lanes/mev/lane.go
	modified:   tests/app/app.go
	modified:   tests/app/lanes.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   block/base/lane.go
	both modified:   block/mempool_test.go
	both modified:   block/mocks/lane.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

* init

* lint

* update mock

* cr

* readme nit

(cherry picked from commit db58154)

# Conflicts:
#	block/base/lane.go
#	block/mempool_test.go
#	block/mocks/lane.go
@mergify mergify bot added the conflicts label Dec 6, 2023
@davidterpay davidterpay merged commit 8fcd596 into release/v2.x.x Dec 6, 2023
8 checks passed
@davidterpay davidterpay deleted the mergify/bp/release/v2.x.x/pr-272 branch December 6, 2023 21:32
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.

1 participant