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

excludes:
- fac303c5 (`MakeUCharSpan` is reintroduced by bitcoin#23438, a part of
  dash#5574)
This commit is contained in:
Kittywhiskers Van Gogh 2024-10-25 21:36:52 +00:00
parent 20d15056f1
commit 5fb2cc8bb6
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
13 changed files with 22 additions and 22 deletions

View File

@ -142,11 +142,10 @@ BITCOIN_CORE_H = \
bech32.h \ bech32.h \
bip324.h \ bip324.h \
blockencodings.h \ blockencodings.h \
bloom.h \ common/bloom.h \
cachemap.h \ cachemap.h \
cachemultimap.h \ cachemultimap.h \
blockfilter.h \ blockfilter.h \
bloom.h \
chain.h \ chain.h \
chainparams.h \ chainparams.h \
chainparamsbase.h \ chainparamsbase.h \
@ -161,6 +160,7 @@ BITCOIN_CORE_H = \
coinjoin/server.h \ coinjoin/server.h \
coinjoin/util.h \ coinjoin/util.h \
coins.h \ coins.h \
common/bloom.h \
compat.h \ compat.h \
compat/assumptions.h \ compat/assumptions.h \
compat/byteswap.h \ compat/byteswap.h \
@ -743,9 +743,9 @@ libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_common_a_SOURCES = \ libbitcoin_common_a_SOURCES = \
base58.cpp \ base58.cpp \
bech32.cpp \ bech32.cpp \
bloom.cpp \
chainparams.cpp \ chainparams.cpp \
coins.cpp \ coins.cpp \
common/bloom.cpp \
compressor.cpp \ compressor.cpp \
core_read.cpp \ core_read.cpp \
core_write.cpp \ core_write.cpp \

View File

@ -6,7 +6,7 @@
#define BITCOIN_BANMAN_H #define BITCOIN_BANMAN_H
#include <addrdb.h> #include <addrdb.h>
#include <bloom.h> #include <common/bloom.h>
#include <fs.h> #include <fs.h>
#include <net_types.h> // For banmap_t #include <net_types.h> // For banmap_t
#include <sync.h> #include <sync.h>

View File

@ -4,7 +4,7 @@
#include <bench/bench.h> #include <bench/bench.h>
#include <bloom.h> #include <common/bloom.h>
static void RollingBloom(benchmark::Bench& bench) static void RollingBloom(benchmark::Bench& bench)
{ {

View File

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

View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_BLOOM_H #ifndef BITCOIN_COMMON_BLOOM_H
#define BITCOIN_BLOOM_H #define BITCOIN_COMMON_BLOOM_H
#include <serialize.h> #include <serialize.h>
#include <span.h> #include <span.h>
@ -133,4 +133,4 @@ private:
int nHashFuncs; int nHashFuncs;
}; };
#endif // BITCOIN_BLOOM_H #endif // BITCOIN_COMMON_BLOOM_H

View File

@ -4,9 +4,9 @@
#include <governance/governance.h> #include <governance/governance.h>
#include <bloom.h>
#include <chain.h> #include <chain.h>
#include <chainparams.h> #include <chainparams.h>
#include <common/bloom.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <deploymentstatus.h> #include <deploymentstatus.h>
#include <evo/deterministicmns.h> #include <evo/deterministicmns.h>

View File

@ -6,10 +6,10 @@
#ifndef BITCOIN_MERKLEBLOCK_H #ifndef BITCOIN_MERKLEBLOCK_H
#define BITCOIN_MERKLEBLOCK_H #define BITCOIN_MERKLEBLOCK_H
#include <common/bloom.h>
#include <primitives/block.h>
#include <serialize.h> #include <serialize.h>
#include <uint256.h> #include <uint256.h>
#include <primitives/block.h>
#include <bloom.h>
#include <vector> #include <vector>

View File

@ -7,8 +7,8 @@
#define BITCOIN_NET_H #define BITCOIN_NET_H
#include <bip324.h> #include <bip324.h>
#include <bloom.h>
#include <chainparams.h> #include <chainparams.h>
#include <common/bloom.h>
#include <compat.h> #include <compat.h>
#include <consensus/amount.h> #include <consensus/amount.h>
#include <fs.h> #include <fs.h>

View File

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

View File

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

View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // 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/FuzzedDataProvider.h>
#include <test/fuzz/fuzz.h> #include <test/fuzz/fuzz.h>
#include <test/fuzz/util.h> #include <test/fuzz/util.h>

View File

@ -52,10 +52,10 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget" "qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget"
"qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil" "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
"bloom -> evo/assetlocktx -> llmq/quorums -> net -> bloom" "common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> common/bloom"
"bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> merkleblock -> bloom" "common/bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> merkleblock -> common/bloom"
"banman -> bloom -> evo/assetlocktx -> llmq/quorums -> net -> banman" "banman -> common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> banman"
"banman -> bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> banman" "banman -> common/bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> banman"
"llmq/chainlocks -> validation -> llmq/chainlocks" "llmq/chainlocks -> validation -> llmq/chainlocks"
"coinjoin/coinjoin -> llmq/chainlocks -> net -> coinjoin/coinjoin" "coinjoin/coinjoin -> llmq/chainlocks -> net -> coinjoin/coinjoin"

View File

@ -21,7 +21,7 @@ unsigned-integer-overflow:addrman.cpp
unsigned-integer-overflow:arith_uint256.h unsigned-integer-overflow:arith_uint256.h
unsigned-integer-overflow:basic_string.h unsigned-integer-overflow:basic_string.h
unsigned-integer-overflow:bench/bench.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.cpp
unsigned-integer-overflow:chain.h unsigned-integer-overflow:chain.h
unsigned-integer-overflow:coded_stream.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:*/new_allocator.h
implicit-integer-sign-change:addrman.h implicit-integer-sign-change:addrman.h
implicit-integer-sign-change:bech32.cpp 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.cpp
implicit-integer-sign-change:chain.h implicit-integer-sign-change:chain.h
implicit-integer-sign-change:coins.h implicit-integer-sign-change:coins.h