Skip to content

Commit fa1e5de

Browse files
author
MarcoFalke
committed
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-
1 parent fac303c commit fa1e5de

File tree

11 files changed

+15
-15
lines changed

11 files changed

+15
-15
lines changed

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ BITCOIN_CORE_H = \
123123
bech32.h \
124124
blockencodings.h \
125125
blockfilter.h \
126-
bloom.h \
126+
common/bloom.h \
127127
chain.h \
128128
chainparams.h \
129129
chainparamsbase.h \
@@ -538,7 +538,7 @@ libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
538538
libbitcoin_common_a_SOURCES = \
539539
base58.cpp \
540540
bech32.cpp \
541-
bloom.cpp \
541+
common/bloom.cpp \
542542
chainparams.cpp \
543543
coins.cpp \
544544
compressor.cpp \

src/banman.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define BITCOIN_BANMAN_H
77

88
#include <addrdb.h>
9-
#include <bloom.h>
9+
#include <common/bloom.h>
1010
#include <fs.h>
1111
#include <net_types.h> // For banmap_t
1212
#include <sync.h>

src/bench/rollingbloom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
#include <bench/bench.h>
7-
#include <bloom.h>
7+
#include <common/bloom.h>
88

99
static void RollingBloom(benchmark::Bench& bench)
1010
{

src/bloom.cpp renamed to src/common/bloom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <bloom.h>
5+
#include <common/bloom.h>
66

77
#include <hash.h>
88
#include <primitives/transaction.h>

src/bloom.h renamed to src/common/bloom.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef BITCOIN_BLOOM_H
6-
#define BITCOIN_BLOOM_H
5+
#ifndef BITCOIN_COMMON_BLOOM_H
6+
#define BITCOIN_COMMON_BLOOM_H
77

88
#include <serialize.h>
99
#include <span.h>
@@ -124,4 +124,4 @@ class CRollingBloomFilter
124124
int nHashFuncs;
125125
};
126126

127-
#endif // BITCOIN_BLOOM_H
127+
#endif // BITCOIN_COMMON_BLOOM_H

src/merkleblock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <serialize.h>
1010
#include <uint256.h>
1111
#include <primitives/block.h>
12-
#include <bloom.h>
12+
#include <common/bloom.h>
1313

1414
#include <vector>
1515

src/net.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define BITCOIN_NET_H
88

99
#include <addrman.h>
10-
#include <bloom.h>
10+
#include <common/bloom.h>
1111
#include <chainparams.h>
1212
#include <compat.h>
1313
#include <consensus/amount.h>

src/test/bloom_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <bloom.h>
5+
#include <common/bloom.h>
66

77
#include <clientversion.h>
88
#include <key.h>

src/test/fuzz/bloom_filter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <bloom.h>
5+
#include <common/bloom.h>
66
#include <primitives/transaction.h>
77
#include <test/fuzz/FuzzedDataProvider.h>
88
#include <test/fuzz/fuzz.h>

src/test/fuzz/rolling_bloom_filter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <bloom.h>
5+
#include <common/bloom.h>
66
#include <test/fuzz/FuzzedDataProvider.h>
77
#include <test/fuzz/fuzz.h>
88
#include <test/fuzz/util.h>

0 commit comments

Comments
 (0)