tx pool: Avoid passing redundant hash into addUnchecked (scripted-diff) #13792

pull MarcoFalke wants to merge 3 commits into bitcoin:master from MarcoFalke:Mf1808-constTxPoolEntries changing 8 files +90 −93
  1. MarcoFalke commented at 1:21 AM on July 29, 2018: member

    Several years ago the transaction hash was not cached. For optimization the hash was instead passed into addUnchecked to avoid re-calculating it. See f77654a0e9424f13cad04f82c014abd78fbb5e38

    Passing in the hash is now redundant and the argument can safely be removed.

  2. MarcoFalke force-pushed on Jul 29, 2018
  3. MarcoFalke force-pushed on Jul 29, 2018
  4. MarcoFalke force-pushed on Jul 29, 2018
  5. DrahtBot commented at 2:17 AM on July 29, 2018: contributor

    <!--e57a25ab6845829454e8d69fc972939a-->Note to reviewers: This pull request conflicts with the following ones:

    • #13922 (Lower default relay fees by ajtowns)
    • #13793 (tx pool: Use class methods to hide raw map iterator impl details by MarcoFalke)
    • #13558 (Drop unused GetType() from CSizeComputer by Empact)

    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.

  6. DrahtBot cross-referenced this on Jul 29, 2018 from issue refactor: Avoid locking tx pool cs thrice by MarcoFalke
  7. DrahtBot cross-referenced this on Jul 29, 2018 from issue Return void instead of bool for functions that cannot fail by practicalswift
  8. DrahtBot cross-referenced this on Jul 29, 2018 from issue Drop unused GetType() from CSizeComputer by Empact
  9. fanquake added the label Refactoring on Jul 29, 2018
  10. DrahtBot added the label Needs rebase on Jul 29, 2018
  11. fanquake commented at 12:39 PM on July 29, 2018: member

    Looks like the scripted-diff is failing because of the other whitespace/formatting changes also included in 8c9d589.

  12. Mark CTxMemPoolEntry members that should not be modified const ddd395f968
  13. tx pool: Use the entry's hash instead of the one passed to addUnchecked fe5c49766c
  14. MarcoFalke force-pushed on Jul 30, 2018
  15. MarcoFalke force-pushed on Jul 30, 2018
  16. scripted-diff: Remove unused first argument to addUnchecked
    -BEGIN VERIFY SCRIPT-
git grep -l addUnchecked | xargs sed --regexp-extended -i -e 's/addUnchecked\([^)][^,]+,\s*/addUnchecked(/g'
-END VERIFY SCRIPT-
    fa587773e5
  17. MarcoFalke force-pushed on Jul 30, 2018
  18. fanquake removed the label Needs rebase on Jul 30, 2018
  19. DrahtBot cross-referenced this on Jul 30, 2018 from issue tx pool: Use class methods to hide raw map iterator impl details by MarcoFalke
  20. MarcoFalke force-pushed on Jul 30, 2018
  21. MarcoFalke force-pushed on Jul 30, 2018
  22. MarcoFalke renamed this:
    tx pool: Avoid passing redundant hash into addUnchecked
    tx pool: Avoid passing redundant hash into addUnchecked (scripted-diff)
    on Jul 30, 2018
  23. MarcoFalke commented at 8:47 PM on July 30, 2018: member

    This is split off of #13804, but not required. So if people hate this kind of refactoring, I am happy to drop it.

  24. bitcoin deleted a comment on Jul 30, 2018
  25. promag commented at 3:10 PM on July 31, 2018: member

    utACK fa58777. I like the change, passing entry is now enough. Could update OP now that #13786 is merged.

  26. practicalswift commented at 7:50 AM on August 2, 2018: contributor

    Concept ACK

  27. Empact commented at 6:50 PM on August 2, 2018: member

    utACK fa58777

  28. DrahtBot cross-referenced this on Aug 9, 2018 from issue Lower default relay fees by ajtowns
  29. MarcoFalke cross-referenced this on Aug 24, 2018 from issue WIP: Transaction Pool Layer by MarcoFalke
  30. laanwj commented at 2:26 PM on August 29, 2018: member

    utACK fe5c49766c0dc5beaf186d77b568361242b20d5e removing the redundancy is good because it avoids a potential bug when passing in the wrong hash

  31. laanwj merged this on Aug 29, 2018
  32. laanwj closed this on Aug 29, 2018
  33. laanwj referenced this in commit 888acefa5e on Aug 29, 2018
  34. MarcoFalke deleted the branch on Aug 29, 2018
  35. domob1812 referenced this in commit 17ad1ad885 on Sep 3, 2018
  36. Bushstar cross-referenced this on Sep 4, 2018 from issue commits from bitcoin/master by Bushstar
  37. Munkybooty referenced this in commit 6af58ab739 on Jun 30, 2021
  38. PastaPastaPasta referenced this in commit 0c8bd25b6d on Jul 18, 2021
  39. PastaPastaPasta referenced this in commit d1484c4fc8 on Jul 18, 2021
  40. PastaPastaPasta referenced this in commit a9a707b556 on Jul 18, 2021
  41. PastaPastaPasta referenced this in commit 94aa3bbac0 on Jul 19, 2021
  42. PastaPastaPasta referenced this in commit 221e8f6dc6 on Jul 19, 2021
  43. bitcoin locked this on Sep 8, 2021
Contributors
MarcoFalkeDrahtBotfanquakepromagpracticalswiftEmpactlaanwj
Labels
Refactoring
Linked (view graph)
#13804 WIP: Transaction Pool Layer
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-05-20 06:55 UTC