diff options
Diffstat (limited to 'src/test/util.cpp')
| -rw-r--r-- | src/test/util.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/util.cpp b/src/test/util.cpp index 7c348c5b25..64ecc6623a 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>( @@ -83,7 +84,8 @@ std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey) .CreateNewBlock(coinbase_scriptPubKey) ->block); - block->nTime = ::chainActive.Tip()->GetMedianTimePast() + 1; + LOCK(cs_main); + block->nTime = ::ChainActive().Tip()->GetMedianTimePast() + 1; block->hashMerkleRoot = BlockMerkleRoot(*block); return block; |