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

fix: Removing IgnoreList from Lane Interface (backport #245) #250

Merged
merged 5 commits into from
Dec 1, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 29, 2023

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

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

You are currently cherry-picking commit b91cfb6.
  (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/base/config.go
	modified:   block/base/handlers.go
	modified:   lanes/base/abci_test.go
	modified:   lanes/base/lane.go
	modified:   lanes/mev/lane.go
	modified:   lanes/mev/mev_test.go
	new file:   tests/app/README.md
	new file:   tests/app/lanes.go

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

* greedy approach to lane verification

* docs

* base lane testing

* mev lane testing nits

* abci top level testing done

* network spamming in E2E

* string rep of escrow address

* nit

* nit

* nit v1.0.1

* removing logs from testing

* query test

* logging with tx info

* nits

* nit

* nit

* testing nit

* adding readmes which i will fill out l8r

* removing ignore list from convo, ur done

* removing logs in testing

* nits

* eh ig we dont need it rn

* removing ignore list from config

* nit test

---------

Co-authored-by: Alex Johnson <[email protected]>
(cherry picked from commit b91cfb6)

# Conflicts:
#	abci/abci_test.go
#	block/base/lane.go
#	block/lane.go
#	block/mempool.go
#	block/mempool_test.go
#	block/mocks/lane.go
#	block/proposals/proposals_test.go
#	tests/app/app.go
@mergify mergify bot added the conflicts label Nov 29, 2023
@davidterpay davidterpay merged commit b9facbc into release/v2.x.x Dec 1, 2023
7 of 8 checks passed
@davidterpay davidterpay deleted the mergify/bp/release/v2.x.x/pr-245 branch December 1, 2023 17:10
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.

1 participant