8000 mempool: slight refactor for improving readability (backport #894) by mergify[bot] · Pull Request #898 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

mempool: slight refactor for improving readability (backport #894) #898

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

mempool: slight refactor for improving readability (backport #894) #898

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented May 31, 2023

This is an automatic backport of pull request #894 done by Mergify.
Cherry-pick of 1d51250 has failed:

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

You are currently cherry-picking commit 1d51250b0.
  (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:   mempool/mempoolTx.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mempool/v0/clist_mempool.go
	both modified:   mempool/v0/reactor.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

@hvanz @mergify
mempool: slight refactor for improving readability (#894)
9ae9597 
* Move mempoolTx to new file; add methods for sender

* renaming

* Pass TxInfo as argument instead of individual fields

* Unexport sender methods

* Fix logging; restore comment

(cherry picked from commit 1d51250)

# Conflicts:
#	mempool/v0/clist_mempool.go
#	mempool/v0/reactor.go
@mergify mergify bot requested a review from a team as a code owner May 31, 2023 17:02
@mergify mergify bot added the conflicts label May 31, 2023
@hvanz
Copy link
Member
hvanz commented May 31, 2023

There are many merge conflicts. I'm closing this PR as the code is too different in this version.

@hvanz hvanz closed this May 31, 2023
@mergify mergify bot deleted the mergify/bp/v0.37.x/pr-894 branch May 31, 2023 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@hvanz
0