Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 23, 2023

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

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

You are currently cherry-picking commit bc835036a.
  (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:
	new file:   .changelog/unreleased/features/1643-nop-mempool.md
	modified:   config/config_test.go
	modified:   docs/core/mempool.md
	new file:   mempool/nop_mempool.go
	new file:   mempool/nop_mempool_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   config/config.go
	both modified:   config/toml.go
	both modified:   docs/architecture/README.md
	deleted by us:   docs/architecture/adr-111-nop-mempool.md
	both modified:   docs/core/configuration.md
	both modified:   node/node.go
	both modified:   node/setup.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

* add `nop` mempool

See
[ADR-111](#1585)

* implement NopMempool and NopMempoolReactor

modify node.go logic

I had to add NopMempoolReactor to pass it to RPC in order not to change
it.

* check config instead of asserting for nil

* start writing docs

* add changelog

* move changelog

* expand docs

* remove unused func arguments

* add simple test

* make linter happy again

* doc fixes

Co-authored-by: Sergio Mena <sergio@informal.systems>

* rename mempoolReactor to waitSyncP2PReactor

* improve changelog message

* allow empty string for backwards compatibility

#1643 (comment)

* make ErrNotAllowed private

* mention `create_empty_blocks` in toml

https://github.com/cometbft/cometbft/pull/1643/files#r1400434715

* return nil instead of closed channel

https://github.com/cometbft/cometbft/pull/1643/files#r1400252575

The reader will block forever, which is exactly what we need.

* grammar fixes

Co-authored-by: lasaro <lasaro@informal.systems>

* update changelog entry

* adapt ADR to implementation

* remove old ToC entry

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
Co-authored-by: Sergio Mena <sergio@informal.systems>
Co-authored-by: lasaro <lasaro@informal.systems>
(cherry picked from commit bc83503)

# Conflicts:
#	config/config.go
#	config/toml.go
#	docs/architecture/README.md
#	docs/architecture/adr-111-nop-mempool.md
#	docs/core/configuration.md
#	node/node.go
#	node/setup.go
@mergify mergify bot requested a review from a team as a code owner November 23, 2023 11:54
@mergify mergify bot added the conflicts label Nov 23, 2023
@melekes melekes self-assigned this Nov 23, 2023
@melekes melekes merged commit 9431a4a into v0.38.x Nov 23, 2023
@melekes melekes deleted the mergify/bp/v0.38.x/pr-1643 branch November 23, 2023 16:15
nivasan1 pushed a commit to nivasan1/cometbft that referenced this pull request Nov 28, 2023
* mempool: add `nop` mempool (cometbft#1643)

* add `nop` mempool

See
[ADR-111](cometbft#1585)

* implement NopMempool and NopMempoolReactor

modify node.go logic

I had to add NopMempoolReactor to pass it to RPC in order not to change
it.

* check config instead of asserting for nil

* start writing docs

* add changelog

* move changelog

* expand docs

* remove unused func arguments

* add simple test

* make linter happy again

* doc fixes

Co-authored-by: Sergio Mena <sergio@informal.systems>

* rename mempoolReactor to waitSyncP2PReactor

* improve changelog message

* allow empty string for backwards compatibility

cometbft#1643 (comment)

* make ErrNotAllowed private

* mention `create_empty_blocks` in toml

https://github.com/cometbft/cometbft/pull/1643/files#r1400434715

* return nil instead of closed channel

https://github.com/cometbft/cometbft/pull/1643/files#r1400252575

The reader will block forever, which is exactly what we need.

* grammar fixes

Co-authored-by: lasaro <lasaro@informal.systems>

* update changelog entry

* adapt ADR to implementation

* remove old ToC entry

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
Co-authored-by: Sergio Mena <sergio@informal.systems>
Co-authored-by: lasaro <lasaro@informal.systems>
(cherry picked from commit bc83503)

* fix merge conflicts

* add a missing ToC entry

---------

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants