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: mempool lane size check on CheckTx (backport #561) #564

Merged
merged 2 commits into from
Jul 3, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 2, 2024

Closes BLO-1473


This is an automatic backport of pull request #561 done by Mergify.

* push

* init

* fix setup

* format

* fix test

* use lane

* ok

* finalize

* fix everything

* lint fix:

* Update abci/checktx/mempool_parity_check_tx.go

Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com>

* lint fix

* tidy

* remove

* cleanup

---------

Co-authored-by: David Terpay <david.terpay@gmail.com>
Co-authored-by: David Terpay <35130517+davidterpay@users.noreply.github.com>
(cherry picked from commit f1cde2a)

# Conflicts:
#	README.md
#	abci/abci.go
#	abci/checktx/check_tx_test.go
#	abci/checktx/mempool_parity_check_tx.go
#	block/mocks/lane.go
#	block/mocks/lane_mempool.go
#	go.mod
#	go.sum
#	tests/app/app.go
#	tests/app/testappd/cmd/testnet.go
#	x/auction/types/mocks/bank_keeper.go
#	x/auction/types/mocks/staking_keeper.go
@mergify mergify bot added the conflicts label Jul 2, 2024
Copy link
Author

mergify bot commented Jul 2, 2024

Cherry-pick of f1cde2a has failed:

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

You are currently cherry-picking commit f1cde2a.
  (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/checktx/mev_check_tx.go
	modified:   abci/utils_test.go
	modified:   block/base/lane.go
	modified:   block/base/match.go
	modified:   block/base/tx_priority.go
	modified:   block/mempool.go
	modified:   block/proposals/utils.go
	modified:   block/types.go
	modified:   lanes/base/abci_test.go
	modified:   lanes/free/lane.go
	modified:   lanes/mev/abci.go
	modified:   lanes/mev/abci_test.go
	modified:   lanes/mev/factory.go
	modified:   lanes/mev/mempool.go
	modified:   lanes/mev/testutils/testutil.go
	modified:   lanes/terminator/lane.go
	modified:   tests/e2e/block_sdk_suite.go
	modified:   tests/e2e/chain_setup.go
	modified:   testutils/utils.go
	modified:   x/auction/client/cli/query.go
	modified:   x/auction/types/mocks/account_keeper.go
	modified:   x/auction/types/mocks/distribution_keeper.go
	modified:   x/auction/types/mocks/rewards_address_provider.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   README.md
	both modified:   abci/abci.go
	both modified:   abci/checktx/check_tx_test.go
	both modified:   abci/checktx/mempool_parity_check_tx.go
	both modified:   block/mocks/lane.go
	both modified:   block/mocks/lane_mempool.go
	both modified:   go.mod
	both modified:   go.sum
	both modified:   tests/app/app.go
	deleted by us:   tests/app/testappd/cmd/testnet.go
	both modified:   x/auction/types/mocks/bank_keeper.go
	both modified:   x/auction/types/mocks/staking_keeper.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

codecov bot commented Jul 3, 2024

Codecov Report

Attention: Patch coverage is 70.00000% with 21 lines in your changes missing coverage. Please review.

Please upload report for BASE (release/v1.x.x@e7a9203). Learn more about missing BASE report.

Files Patch % Lines
abci/checktx/mempool_parity_check_tx.go 69.35% 16 Missing and 3 partials ⚠️
block/base/match.go 0.00% 1 Missing ⚠️
block/types.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@                Coverage Diff                @@
##             release/v1.x.x     #564   +/-   ##
=================================================
  Coverage                  ?   50.53%           
=================================================
  Files                     ?       41           
  Lines                     ?     1852           
  Branches                  ?        0           
=================================================
  Hits                      ?      936           
  Misses                    ?      823           
  Partials                  ?       93           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@aljo242 aljo242 merged commit 09f12d2 into release/v1.x.x Jul 3, 2024
11 of 12 checks passed
@aljo242 aljo242 deleted the mergify/bp/release/v1.x.x/pr-561 branch July 3, 2024 15:42
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