From fa8f60e31102e1153ad1452fbced51e54487a3d4 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 12 Nov 2021 10:19:33 +0100 Subject: [PATCH] scripted-diff: Move minisketchwrapper to src/node -BEGIN VERIFY SCRIPT- # Move module git mv src/minisketchwrapper.cpp src/node/ git mv src/minisketchwrapper.h src/node/ # Replacements sed -i 's:minisketchwrapper:node/minisketchwrapper:g' $(git grep -l minisketchwrapper) sed -i 's:MINISKETCHWRAPPER_H:NODE_MINISKETCHWRAPPER_H:g' $(git grep -l MINISKETCHWRAPPER_H) sed -i 's:DBWRAPPER_H:NODE_MINISKETCHWRAPPER_H:g' ./src/node/minisketchwrapper.h -END VERIFY SCRIPT- --- src/Makefile.am | 4 ++-- src/{ => node}/minisketchwrapper.cpp | 2 +- src/{ => node}/minisketchwrapper.h | 6 +++--- src/test/minisketch_tests.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/{ => node}/minisketchwrapper.cpp (98%) rename src/{ => node}/minisketchwrapper.h (79%) diff --git a/src/Makefile.am b/src/Makefile.am index 85450149cf..3e5b04b668 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -167,7 +167,7 @@ BITCOIN_CORE_H = \ memusage.h \ merkleblock.h \ miner.h \ - minisketchwrapper.h \ + node/minisketchwrapper.h \ net.h \ net_permissions.h \ net_processing.h \ @@ -335,7 +335,7 @@ libbitcoin_server_a_SOURCES = \ init.cpp \ mapport.cpp \ miner.cpp \ - minisketchwrapper.cpp \ + node/minisketchwrapper.cpp \ net.cpp \ net_processing.cpp \ node/blockstorage.cpp \ diff --git a/src/minisketchwrapper.cpp b/src/node/minisketchwrapper.cpp similarity index 98% rename from src/minisketchwrapper.cpp rename to src/node/minisketchwrapper.cpp index fb176fb153..572df63463 100644 --- a/src/minisketchwrapper.cpp +++ b/src/node/minisketchwrapper.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/minisketchwrapper.h b/src/node/minisketchwrapper.h similarity index 79% rename from src/minisketchwrapper.h rename to src/node/minisketchwrapper.h index 409221de79..426781d508 100644 --- a/src/minisketchwrapper.h +++ b/src/node/minisketchwrapper.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_MINISKETCHWRAPPER_H -#define BITCOIN_MINISKETCHWRAPPER_H +#ifndef BITCOIN_NODE_MINISKETCHWRAPPER_H +#define BITCOIN_NODE_MINISKETCHWRAPPER_H #include #include @@ -14,4 +14,4 @@ Minisketch MakeMinisketch32(size_t capacity); /** Wrapper around Minisketch::CreateFP. */ Minisketch MakeMinisketch32FP(size_t max_elements, uint32_t fpbits); -#endif // BITCOIN_DBWRAPPER_H +#endif // BITCOIN_NODE_MINISKETCHWRAPPER_H diff --git a/src/test/minisketch_tests.cpp b/src/test/minisketch_tests.cpp index 6798331936..f7dd18923b 100644 --- a/src/test/minisketch_tests.cpp +++ b/src/test/minisketch_tests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include +#include #include #include