diff --git a/src/Makefile.am b/src/Makefile.am index 1ba29a075c..e91973a67c 100644 --- 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 index a8afc34e82..1c534f653f 100644 --- a/src/banman.h +++ b/src/banman.h @@ -6,7 +6,7 @@ #define BITCOIN_BANMAN_H #include -#include +#include #include #include // For banmap_t #include diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp index 28167767db..30bc1d5fdf 100644 --- a/src/bench/rollingbloom.cpp +++ b/src/bench/rollingbloom.cpp @@ -4,7 +4,7 @@ #include -#include +#include static void RollingBloom(benchmark::Bench& bench) { diff --git a/src/bloom.cpp b/src/common/bloom.cpp similarity index 99% rename from src/bloom.cpp rename to src/common/bloom.cpp index 50cf719495..6fc86cf72a 100644 --- a/src/bloom.cpp +++ b/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 +#include #include #include diff --git a/src/bloom.h b/src/common/bloom.h similarity index 98% rename from src/bloom.h rename to src/common/bloom.h index f0630650db..8a206f2fd4 100644 --- a/src/bloom.h +++ b/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 #include @@ -133,4 +133,4 @@ private: int nHashFuncs; }; -#endif // BITCOIN_BLOOM_H +#endif // BITCOIN_COMMON_BLOOM_H diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp index b0be98ad43..7318708ecc 100644 --- a/src/governance/governance.cpp +++ b/src/governance/governance.cpp @@ -4,9 +4,9 @@ #include -#include #include #include +#include #include #include #include diff --git a/src/merkleblock.h b/src/merkleblock.h index 0e4ed72130..70749b6378 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -6,10 +6,10 @@ #ifndef BITCOIN_MERKLEBLOCK_H #define BITCOIN_MERKLEBLOCK_H +#include +#include #include #include -#include -#include #include diff --git a/src/net.h b/src/net.h index 313c5be205..11215bee87 100644 --- a/src/net.h +++ b/src/net.h @@ -7,8 +7,8 @@ #define BITCOIN_NET_H #include -#include #include +#include #include #include #include diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index da08a9b30b..e7bd229d9f 100644 --- 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 #include #include +#include #include #include #include diff --git a/src/test/fuzz/bloom_filter.cpp b/src/test/fuzz/bloom_filter.cpp index d43c182644..f25e352592 100644 --- 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 +#include #include #include #include diff --git a/src/test/fuzz/rolling_bloom_filter.cpp b/src/test/fuzz/rolling_bloom_filter.cpp index ec53b4f715..86d60a7aa9 100644 --- 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 +#include #include #include #include diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh index 90eb137688..3516033753 100755 --- 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 index 846c6f41dc..c5fb0d34f4 100644 --- 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