diff options
| author | MarcoFalke <[email protected]> | 2019-04-17 15:14:05 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-04-17 15:14:12 -0400 |
| commit | dae72998e8576439254ee497e82e2b9ce4917977 (patch) | |
| tree | 69a8b21b3f016e7d3eec75267e0db06cd2dd0f72 /src/test | |
| parent | Merge #15831: test: Add test that addmultisigaddress fails for watchonly addr... (diff) | |
| parent | refactor: Add handleNotifications method to wallet (diff) | |
| download | discoin-dae72998e8576439254ee497e82e2b9ce4917977.tar.xz discoin-dae72998e8576439254ee497e82e2b9ce4917977.zip | |
Merge #15779: test: Add wallet_balance benchmark
fad7c33342 refactor: Add handleNotifications method to wallet (MarcoFalke)
fa46ac3127 bench: Add wallet_balance benchmarks (MarcoFalke)
Pull request description:
ACKs for commit fad7c3:
ryanofsky:
utACK fad7c33342cb51b310a7dd372bfa675df8810367. I might squash or rearrange the commits to avoid adding code in one commit that just gets deleted in the next one. But overall this looks good and the cleanup is nice.
Tree-SHA512: 231faac168cbe9bb0ab4bf10ac1d5b042c610364406d75061fba27f1e9d16c71867e74cc4606e9f42659aa980d7133c00e29fcc18bbba7da2fa7a80178b3246c
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/util.cpp | 3 | ||||
| -rw-r--r-- | src/test/util.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/test/util.cpp b/src/test/util.cpp index 7c348c5b2..05d3a97a5 100644 --- a/src/test/util.cpp +++ b/src/test/util.cpp @@ -22,6 +22,8 @@ #include <boost/thread.hpp> +const std::string ADDRESS_BCRT1_UNSPENDABLE = "bcrt1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq3xueyj"; + #ifdef ENABLE_WALLET std::string getnewaddress(CWallet& w) { @@ -75,7 +77,6 @@ CTxIn MineBlock(const CScript& coinbase_scriptPubKey) return CTxIn{block->vtx[0]->GetHash(), 0}; } - std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey) { auto block = std::make_shared<CBlock>( diff --git a/src/test/util.h b/src/test/util.h index e51e924f6..8ba647ec3 100644 --- a/src/test/util.h +++ b/src/test/util.h @@ -13,6 +13,10 @@ class CScript; class CTxIn; class CWallet; +// Constants // + +extern const std::string ADDRESS_BCRT1_UNSPENDABLE; + // Lower-level utils // /** Returns the generated coin */ |