diff options
author | James O'Beirne <james.obeirne@gmail.com> | 2019-03-27 11:14:25 -0400 |
---|---|---|
committer | James O'Beirne <james.obeirne@gmail.com> | 2019-05-03 15:02:54 -0400 |
commit | 631940aab228ccca64c15e05d5953f40381a0ffc (patch) | |
tree | 694cfe15bf0a6d9271fc9b6c10fda5a77c935580 /src/test/setup_common.cpp | |
parent | a3a609079c76dd2bbc72127488bf466cc61d8940 (diff) | |
download | bitcoin-631940aab228ccca64c15e05d5953f40381a0ffc.tar.xz |
scripted-diff: replace chainActive -> ::ChainActive()
Though at the moment ChainActive() simply references `g_chainstate.m_chain`,
doing this change now clears the way for multiple chainstate usage and allows
us to script the diff.
-BEGIN VERIFY SCRIPT-
git grep -l "chainActive" | grep -E '(h|cpp)$' | xargs sed -i '/chainActive =/b; /extern CChain& chainActive/b; s/\(::\)\{0,1\}chainActive/::ChainActive()/g'
-END VERIFY SCRIPT-
Diffstat (limited to 'src/test/setup_common.cpp')
-rw-r--r-- | src/test/setup_common.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/setup_common.cpp b/src/test/setup_common.cpp index 6b671b2400..5b454da52b 100644 --- a/src/test/setup_common.cpp +++ b/src/test/setup_common.cpp @@ -151,7 +151,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& { LOCK(cs_main); unsigned int extraNonce = 0; - IncrementExtraNonce(&block, chainActive.Tip(), extraNonce); + IncrementExtraNonce(&block, ::ChainActive().Tip(), extraNonce); } while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce; |