Move-only: bloom to src/common #23137

pull MarcoFalke wants to merge 3 commits into bitcoin:master from MarcoFalke:2109-srcCommon changing 11 files +17 −17
  1. MarcoFalke commented at 3:25 pm on September 29, 2021: member

    To avoid having all files at the top level ./src directory, start moving them to their respective sub directory according to #15732.

    bloom currently depends on libconsensus (CTransaction, CScript, …) and it is currently located in the libcommon. Thus, move it to src/common/. (libutil in src/util/ is for stuff that doesn’t depend on libconsensus).

  2. MarcoFalke commented at 3:26 pm on September 29, 2021: member
    See also #22951 (which has a minor conflict in one adjacent line).
  3. DrahtBot added the label Build system on Sep 29, 2021
  4. DrahtBot added the label P2P on Sep 29, 2021
  5. DrahtBot added the label Refactoring on Sep 29, 2021
  6. vincenzopalazzo approved
  7. MarcoFalke removed the label P2P on Sep 30, 2021
  8. practicalswift commented at 8:22 am on September 30, 2021: contributor
    Concept ACK
  9. naumenkogs commented at 10:18 am on September 30, 2021: member
    Concept ACK
  10. DrahtBot commented at 2:44 pm on September 30, 2021: member

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

    Conflicts

    No conflicts as of last run.

  11. DrahtBot added the label Needs rebase on Oct 5, 2021
  12. refactor: Remove unused MakeUCharSpan fac303c504
  13. scripted-diff: Move bloom to src/common
    -BEGIN VERIFY SCRIPT-
     # Move to directory
     mkdir                src/common
     git mv src/bloom.cpp src/common/
     git mv src/bloom.h   src/common/
    
     # Replace occurrences
     sed -i 's|\<bloom\.cpp\>|common/bloom.cpp|g' $(git grep -l 'bloom.cpp')
     sed -i 's|\<bloom\.h\>|common/bloom.h|g'     $(git grep -l 'bloom.h')
     sed -i 's|BITCOIN_BLOOM_H|BITCOIN_COMMON_BLOOM_H|g' $(git grep -l 'BLOOM_H')
    -END VERIFY SCRIPT-
    fa1e5de2db
  14. style: Sort fa2d611bed
  15. MarcoFalke force-pushed on Oct 5, 2021
  16. DrahtBot removed the label Needs rebase on Oct 5, 2021
  17. theStack approved
  18. theStack commented at 10:07 am on October 10, 2021: member

    Code-review ACK fa2d611bedc2a755dcf84a82699c70b57b903cf6

    TIL how to move files via scripted-diff (IIRC I tried once and failed, probably used “mv” rather than “git mv”…)

  19. in src/common/bloom.cpp:85 in fa2d611bed
    81@@ -82,7 +82,7 @@ bool CBloomFilter::contains(const COutPoint& outpoint) const
    82 {
    83     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
    84     stream << outpoint;
    85-    return contains(MakeUCharSpan(stream));
    86+    return contains(stream);
    


    hebasto commented at 7:31 pm on October 10, 2021:

    fac303c504ab19b863fddc7a0093068fee9d4ef3

    Why MakeUCharSpan became unused? What has been changed since 2ba4ddf31d27bebc144b3729479967b40bbe0b6a from #23115?


    MarcoFalke commented at 6:37 am on October 11, 2021:
    There was simply no reason to add it. cc @fanquake
  20. hebasto commented at 7:31 pm on October 10, 2021: member
    Concept ACK.
  21. MarcoFalke requested review from ryanofsky on Oct 11, 2021
  22. MarcoFalke requested review from fanquake on Oct 20, 2021
  23. ryanofsky approved
  24. ryanofsky commented at 12:45 pm on October 20, 2021: member
    Code review ACK fa2d611bedc2a755dcf84a82699c70b57b903cf6
  25. fanquake approved
  26. fanquake commented at 2:25 am on October 21, 2021: member
    ACK fa2d611bedc2a755dcf84a82699c70b57b903cf6 - source shuffle starts now.
  27. fanquake merged this on Oct 21, 2021
  28. fanquake closed this on Oct 21, 2021

  29. MarcoFalke deleted the branch on Oct 21, 2021
  30. sidhujag referenced this in commit 5c4f8b30ab on Oct 21, 2021
  31. DrahtBot locked this on Oct 30, 2022

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: 2024-11-17 15:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me