diff options
| author | Martin Zumsande <mzumsande@gmail.com> | 2019-11-25 13:57:47 +0100 |
|---|---|---|
| committer | Martin Zumsande <mzumsande@gmail.com> | 2019-11-25 16:40:09 +0100 |
| commit | 78e283e656bf1643944ffdb76185f3468eb25895 (patch) | |
| tree | a80dd0ba15cf71e5d92709cf30d96d35cc403365 | |
| parent | f613e5dfdafe708f63ebb5193c44e2bc770c6651 (diff) | |
[test] move wallet helper functions into test library
| -rw-r--r-- | src/Makefile.bench.include | 4 | ||||
| -rw-r--r-- | src/Makefile.test_util.include | 4 | ||||
| -rw-r--r-- | src/bench/block_assemble.cpp | 2 | ||||
| -rw-r--r-- | src/bench/wallet_balance.cpp | 2 | ||||
| -rw-r--r-- | src/test/util/wallet.cpp (renamed from src/test/util.cpp) | 2 | ||||
| -rw-r--r-- | src/test/util/wallet.h (renamed from src/test/util.h) | 7 |
6 files changed, 11 insertions, 10 deletions
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index 9e70db116b..1c97e22de8 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -39,9 +39,7 @@ bench_bench_bitcoin_SOURCES = \ bench/bech32.cpp \ bench/lockedpool.cpp \ bench/poly1305.cpp \ - bench/prevector.cpp \ - test/util.h \ - test/util.cpp + bench/prevector.cpp nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES) diff --git a/src/Makefile.test_util.include b/src/Makefile.test_util.include index 139b709569..505d630b7d 100644 --- a/src/Makefile.test_util.include +++ b/src/Makefile.test_util.include @@ -13,7 +13,8 @@ TEST_UTIL_H = \ test/util/mining.h \ test/util/setup_common.h \ test/util/str.h \ - test/util/transaction_utils.h + test/util/transaction_utils.h \ + test/util/wallet.h libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) libtest_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) @@ -24,6 +25,7 @@ libtest_util_a_SOURCES = \ test/util/setup_common.cpp \ test/util/str.cpp \ test/util/transaction_utils.cpp \ + test/util/wallet.cpp \ $(TEST_UTIL_H) LIBTEST_UTIL += $(LIBBITCOIN_SERVER) diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp index 2ccae0c667..184367e1e5 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -5,8 +5,8 @@ #include <bench/bench.h> #include <consensus/validation.h> #include <crypto/sha256.h> -#include <test/util.h> #include <test/util/mining.h> +#include <test/util/wallet.h> #include <txmempool.h> #include <validation.h> diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp index bd79ddfdd6..f39dcc0b71 100644 --- a/src/bench/wallet_balance.cpp +++ b/src/bench/wallet_balance.cpp @@ -6,8 +6,8 @@ #include <interfaces/chain.h> #include <node/context.h> #include <optional.h> -#include <test/util.h> #include <test/util/mining.h> +#include <test/util/wallet.h> #include <validationinterface.h> #include <wallet/wallet.h> diff --git a/src/test/util.cpp b/src/test/util/wallet.cpp index e775ad323b..226d2df6e4 100644 --- a/src/test/util.cpp +++ b/src/test/util/wallet.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 <test/util.h> +#include <test/util/wallet.h> #include <key_io.h> #include <outputtype.h> diff --git a/src/test/util.h b/src/test/util/wallet.h index 7adeaea772..565ef1756a 100644 --- a/src/test/util.h +++ b/src/test/util/wallet.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_TEST_UTIL_H -#define BITCOIN_TEST_UTIL_H +#ifndef BITCOIN_TEST_UTIL_WALLET_H +#define BITCOIN_TEST_UTIL_WALLET_H #include <string> @@ -20,4 +20,5 @@ void importaddress(CWallet& wallet, const std::string& address); /** Returns a new address from the wallet */ std::string getnewaddress(CWallet& w); -#endif // BITCOIN_TEST_UTIL_H + +#endif // BITCOIN_TEST_UTIL_WALLET_H |