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

feat: Greedy Algorithm for Lane Verification (backport #236) #242

Merged
merged 3 commits into from
Nov 28, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 27, 2023

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

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

You are currently cherry-picking commit f7dfbda.
  (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:   .markdownlint.json
	modified:   abci/utils_test.go
	modified:   block/base/abci.go
	modified:   block/base/handlers.go
	modified:   block/base/types.go
	modified:   block/lane.go
	modified:   block/mocks/lane.go
	modified:   block/proposals/proposals.go
	modified:   block/proposals/update.go
	modified:   block/types.go
	modified:   block/utils/utils.go
	modified:   lanes/base/abci_test.go
	modified:   lanes/mev/abci.go
	modified:   lanes/terminator/lane.go
	modified:   tests/integration/block_sdk_integration_test.go
	modified:   tests/integration/block_sdk_suite.go
	modified:   tests/integration/chain_setup.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   abci/abci.go
	both modified:   abci/abci_test.go
	both modified:   abci/utils.go
	both modified:   lanes/mev/abci_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

* greedy approach to lane verification

* docs

* base lane testing

* mev lane testing nits

* abci top level testing done

* network spamming in E2E

* removing logs from testing

* nit

(cherry picked from commit f7dfbda)

# Conflicts:
#	abci/abci.go
#	abci/abci_test.go
#	abci/utils.go
#	lanes/mev/abci_test.go
@mergify mergify bot added the conflicts label Nov 27, 2023
@davidterpay davidterpay merged commit 6cd38ff into release/v2.x.x Nov 28, 2023
7 of 8 checks passed
@davidterpay davidterpay deleted the mergify/bp/release/v2.x.x/pr-236 branch November 28, 2023 18:50
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