diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-12-16 16:08:52 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-12-16 16:08:56 -0500 |
| commit | 94c6f2bba45100abeaf310057a989f8644115eaf (patch) | |
| tree | 1aebc165029778570380ddf57d66cd81a6e132b3 /src/bench | |
| parent | f9fd3a27fda3da3eb45de4e46e7145506e27d96b (diff) | |
| parent | 78e283e656bf1643944ffdb76185f3468eb25895 (diff) | |
| download | bitcoin-94c6f2bba45100abeaf310057a989f8644115eaf.tar.xz | |
Merge #17593: test: move more utility functions into test utility library
78e283e656bf1643944ffdb76185f3468eb25895 [test] move wallet helper functions into test library (Martin Zumsande)
f613e5dfdafe708f63ebb5193c44e2bc770c6651 [test] move mining helper functions into test library (Martin Zumsande)
2cb4e8bdc7ef75ae8d95c246af1e8e1f9c7045bd [test] move string helper functions into test library (Martin Zumsande)
Pull request description:
This disbands `test/util.h` and `test/util.cpp` and moves the content into the test utility library recently created in #17542, so that all test utility functions are in one place.
The content of the original files are split into three modules:
1) string helper functions go to `test/util/str`
2) mining helper functions go to the newly created `test/util/mining`
3) wallet helper functions go to the newly created `test/util/wallet`
ACKs for top commit:
MarcoFalke:
ACK 78e283e656bf1643944ffdb76185f3468eb25895 🔧
Tree-SHA512: f182a61e86e76c32bcb84e37f44904d3a4a9c5a321f7a8efdda5368a6623cb8b5a5384ec4f96e67f0357b0c22099f6e3ecd0ac4cb467e3fa3f3128f8d36edfb8
Diffstat (limited to 'src/bench')
| -rw-r--r-- | src/bench/block_assemble.cpp | 3 | ||||
| -rw-r--r-- | src/bench/wallet_balance.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp index 2f47398d99..184367e1e5 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -5,7 +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 0e660d6bcd..f39dcc0b71 100644 --- a/src/bench/wallet_balance.cpp +++ b/src/bench/wallet_balance.cpp @@ -6,7 +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> |