merge bitcoin#23137: move-only bloom to src/common

excludes: - fac303c (`MakeUCharSpan` is reintroduced by bitcoin#23438, a part of dash#5574)
dashpay · Oct 25, 2024 · 5fb2cc8 · 5fb2cc8
1 parent 20d1505
commit 5fb2cc8
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 22 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -142,11 +142,10 @@ BITCOIN_CORE_H = \
   bech32.h \
   bip324.h \
   blockencodings.h \
-  bloom.h \
+  common/bloom.h \
   cachemap.h \
   cachemultimap.h \
   blockfilter.h \
-  bloom.h \
   chain.h \
   chainparams.h \
   chainparamsbase.h \
@@ -161,6 +160,7 @@ BITCOIN_CORE_H = \
   coinjoin/server.h \
   coinjoin/util.h \
   coins.h \
+  common/bloom.h \
   compat.h \
   compat/assumptions.h \
   compat/byteswap.h \
@@ -743,9 +743,9 @@ libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_common_a_SOURCES = \
   base58.cpp \
   bech32.cpp \
-  bloom.cpp \
   chainparams.cpp \
   coins.cpp \
+  common/bloom.cpp \
   compressor.cpp \
   core_read.cpp \
   core_write.cpp \

diff --git a/src/banman.h b/src/banman.h
@@ -6,7 +6,7 @@
 #define BITCOIN_BANMAN_H
 
 #include <addrdb.h>
-#include <bloom.h>
+#include <common/bloom.h>
 #include <fs.h>
 #include <net_types.h> // For banmap_t
 #include <sync.h>

diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp
@@ -4,7 +4,7 @@
 
 
 #include <bench/bench.h>
-#include <bloom.h>
+#include <common/bloom.h>
 
 static void RollingBloom(benchmark::Bench& bench)
 {

diff --git a/src/bloom.cpp → src/common/bloom.cpp b/src/bloom.cpp → src/common/bloom.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bloom.h>
+#include <common/bloom.h>
 
 #include <evo/assetlocktx.h>
 #include <evo/providertx.h>

diff --git a/src/bloom.h → src/common/bloom.h b/src/bloom.h → src/common/bloom.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_BLOOM_H
-#define BITCOIN_BLOOM_H
+#ifndef BITCOIN_COMMON_BLOOM_H
+#define BITCOIN_COMMON_BLOOM_H
 
 #include <serialize.h>
 #include <span.h>
@@ -133,4 +133,4 @@ class CRollingBloomFilter
     int nHashFuncs;
 };
 
-#endif // BITCOIN_BLOOM_H
+#endif // BITCOIN_COMMON_BLOOM_H
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
@@ -4,9 +4,9 @@
 
 #include <governance/governance.h>
 
-#include <bloom.h>
 #include <chain.h>
 #include <chainparams.h>
+#include <common/bloom.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <evo/deterministicmns.h>

diff --git a/src/merkleblock.h b/src/merkleblock.h
@@ -6,10 +6,10 @@
 #ifndef BITCOIN_MERKLEBLOCK_H
 #define BITCOIN_MERKLEBLOCK_H
 
+#include <common/bloom.h>
+#include <primitives/block.h>
 #include <serialize.h>
 #include <uint256.h>
-#include <primitives/block.h>
-#include <bloom.h>
 
 #include <vector>
 

diff --git a/src/net.h b/src/net.h
@@ -7,8 +7,8 @@
 #define BITCOIN_NET_H
 
 #include <bip324.h>
-#include <bloom.h>
 #include <chainparams.h>
+#include <common/bloom.h>
 #include <compat.h>
 #include <consensus/amount.h>
 #include <fs.h>

diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bloom.h>
 #include <bls/bls.h>
 #include <clientversion.h>
+#include <common/bloom.h>
 #include <key.h>
 #include <key_io.h>
 #include <merkleblock.h>

diff --git a/src/test/fuzz/bloom_filter.cpp b/src/test/fuzz/bloom_filter.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bloom.h>
+#include <common/bloom.h>
 #include <primitives/transaction.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>

diff --git a/src/test/fuzz/rolling_bloom_filter.cpp b/src/test/fuzz/rolling_bloom_filter.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bloom.h>
+#include <common/bloom.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>

diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
@@ -52,10 +52,10 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget"
     "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
 
-    "bloom -> evo/assetlocktx -> llmq/quorums -> net -> bloom"
-    "bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> merkleblock -> bloom"
-    "banman -> bloom -> evo/assetlocktx -> llmq/quorums -> net -> banman"
-    "banman -> bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> banman"
+    "common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> common/bloom"
+    "common/bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> merkleblock -> common/bloom"
+    "banman -> common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> banman"
+    "banman -> common/bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> banman"
 
     "llmq/chainlocks -> validation -> llmq/chainlocks"
     "coinjoin/coinjoin -> llmq/chainlocks -> net -> coinjoin/coinjoin"

diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
@@ -21,7 +21,7 @@ unsigned-integer-overflow:addrman.cpp
 unsigned-integer-overflow:arith_uint256.h
 unsigned-integer-overflow:basic_string.h
 unsigned-integer-overflow:bench/bench.h
-unsigned-integer-overflow:bloom.cpp
+unsigned-integer-overflow:common/bloom.cpp
 unsigned-integer-overflow:chain.cpp
 unsigned-integer-overflow:chain.h
 unsigned-integer-overflow:coded_stream.h
@@ -48,7 +48,7 @@ implicit-integer-sign-change:*/include/c++/
 implicit-integer-sign-change:*/new_allocator.h
 implicit-integer-sign-change:addrman.h
 implicit-integer-sign-change:bech32.cpp
-implicit-integer-sign-change:bloom.cpp
+implicit-integer-sign-change:common/bloom.cpp
 implicit-integer-sign-change:chain.cpp
 implicit-integer-sign-change:chain.h
 implicit-integer-sign-change:coins.h