Skip to content

Commit 49ef53c

Browse files
committed
merge bitcoin#23491: Move minisketchwrapper to src/node
1 parent 25c3355 commit 49ef53c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ BITCOIN_CORE_H = \
258258
memusage.h \
259259
merkleblock.h \
260260
messagesigner.h \
261-
minisketchwrapper.h \
262261
net.h \
263262
net_permissions.h \
264263
net_processing.h \
@@ -275,6 +274,7 @@ BITCOIN_CORE_H = \
275274
node/context.h \
276275
node/eviction.h \
277276
node/miner.h \
277+
node/minisketchwrapper.h \
278278
node/psbt.h \
279279
node/transaction.h \
280280
node/ui_interface.h \
@@ -494,7 +494,6 @@ libbitcoin_server_a_SOURCES = \
494494
masternode/payments.cpp \
495495
masternode/sync.cpp \
496496
masternode/utils.cpp \
497-
minisketchwrapper.cpp \
498497
net.cpp \
499498
netfulfilledman.cpp \
500499
netgroup.cpp \
@@ -507,6 +506,7 @@ libbitcoin_server_a_SOURCES = \
507506
node/eviction.cpp \
508507
node/interfaces.cpp \
509508
node/miner.cpp \
509+
node/minisketchwrapper.cpp \
510510
node/psbt.cpp \
511511
node/transaction.cpp \
512512
node/ui_interface.cpp \

src/minisketchwrapper.cpp renamed to src/node/minisketchwrapper.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 <minisketchwrapper.h>
5+
#include <node/minisketchwrapper.h>
66

77
#include <logging.h>
88
#include <util/time.h>

src/minisketchwrapper.h renamed to src/node/minisketchwrapper.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_MINISKETCHWRAPPER_H
6-
#define BITCOIN_MINISKETCHWRAPPER_H
5+
#ifndef BITCOIN_NODE_MINISKETCHWRAPPER_H
6+
#define BITCOIN_NODE_MINISKETCHWRAPPER_H
77

88
#include <minisketch.h>
99
#include <cstddef>
@@ -14,4 +14,4 @@ Minisketch MakeMinisketch32(size_t capacity);
1414
/** Wrapper around Minisketch::CreateFP. */
1515
Minisketch MakeMinisketch32FP(size_t max_elements, uint32_t fpbits);
1616

17-
#endif // BITCOIN_DBWRAPPER_H
17+
#endif // BITCOIN_NODE_MINISKETCHWRAPPER_H

src/test/minisketch_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <minisketch.h>
6-
#include <minisketchwrapper.h>
6+
#include <node/minisketchwrapper.h>
77
#include <random.h>
88
#include <test/util/setup_common.h>
99

0 commit comments

Comments
 (0)