Skip to content

Conversation

jnewbery
Copy link
Contributor

Fixes a logging issue introduced in #15681

@jnewbery
Copy link
Contributor Author

Reported here: #15681 (comment)

@TheBlueMatt
Copy link
Contributor

Right, its somewhat unclear what the correct log message should be. If you were trying to use the carve-out you want the original version, which I somewhat naively assumed would be correct, but I think you're right, makes more sense to use the original one.
utACK.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 26, 2019

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #16421 (Conservatively accept RBF bumps bumping one tx at the package limits by TheBlueMatt)
  • #16401 (Package relay by sdaftuar)
  • #16400 ([refactor] Rewrite AcceptToMemoryPoolWorker() using smaller parts by sdaftuar)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@laanwj
Copy link
Member

laanwj commented Jul 29, 2019

ACK 42a5e91 (+utACK from bluematt that isn't registered because it has no commit id)

@laanwj laanwj merged commit 42a5e91 into bitcoin:master Jul 29, 2019
laanwj added a commit that referenced this pull request Jul 29, 2019
42a5e91 [mempool] log correct messages when CPFP fails (John Newbery)

Pull request description:

  Fixes a logging issue introduced in #15681

ACKs for top commit:
  laanwj:
    ACK 42a5e91 (+utACK from bluematt that isn't registered because it has no commit id)

Tree-SHA512: ff5f423cc4d22838eea00c5b1d39ceda89cd61474c72f256a97c698eb0ec3f2156a97139f537669376132902c1e3943bf84c356a4b98a9a306b4ec57302c2761
@jnewbery jnewbery deleted the 2019-07-fix-CalculateMempoolAncestors-logging branch July 29, 2019 17:07
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Nov 16, 2021
42a5e91 [mempool] log correct messages when CPFP fails (John Newbery)

Pull request description:

  Fixes a logging issue introduced in bitcoin#15681

ACKs for top commit:
  laanwj:
    ACK 42a5e91 (+utACK from bluematt that isn't registered because it has no commit id)

Tree-SHA512: ff5f423cc4d22838eea00c5b1d39ceda89cd61474c72f256a97c698eb0ec3f2156a97139f537669376132902c1e3943bf84c356a4b98a9a306b4ec57302c2761
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
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.

4 participants