diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2018-12-12 18:00:20 +1300 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2018-12-12 18:00:42 +1300 |
| commit | ed2a2cebd36280be0b5e585a8c3c901c15e52f87 (patch) | |
| tree | da624fc441d58ed88dc6542962cfd7eb4258fb20 /src/test/test_bitcoin.h | |
| parent | 3fff1ab817e7995720c3aa0374807ed70d1a4d24 (diff) | |
| parent | bd3b0361d840bff95988a048abf70ade94d80524 (diff) | |
| download | bitcoin-ed2a2cebd36280be0b5e585a8c3c901c15e52f87.tar.xz | |
Merge #13076: Fix ScanForWalletTransactions to return an enum indicating scan result: success / failure / user_abort
bd3b0361d Add stop_block out arg to ScanForWalletTransactions (Ben Woosley)
3002d6cf3 Return a status enum from ScanForWalletTransactions (Ben Woosley)
bb24d6865 Make CWallet::ScanForWalletTransactions args and return value const (Ben Woosley)
Pull request description:
Return the failed block as an out arg.
Fixes #11450.
/cc #12275
Tree-SHA512: 6a523e5425ebfe24e664a942ae21c797ccc1281c25b1bf8d02ad95c19dae343fd8051985ef11853474de7628fd6bed5f15190fbc087c3466ce6fdecab37d72a9
Diffstat (limited to 'src/test/test_bitcoin.h')
| -rw-r--r-- | src/test/test_bitcoin.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h index 3872767133..182571b004 100644 --- a/src/test/test_bitcoin.h +++ b/src/test/test_bitcoin.h @@ -15,9 +15,17 @@ #include <txmempool.h> #include <memory> +#include <type_traits> #include <boost/thread.hpp> +// Enable BOOST_CHECK_EQUAL for enum class types +template <typename T> +std::ostream& operator<<(typename std::enable_if<std::is_enum<T>::value, std::ostream>::type& stream, const T& e) +{ + return stream << static_cast<typename std::underlying_type<T>::type>(e); +} + extern uint256 insecure_rand_seed; extern FastRandomContext insecure_rand_ctx; |