highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 15:09:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7053

Browse Source 
2e29e7e Globals: Remove a bunch of Params() calls from main.cpp: (Jorge Timón)
This commit is contained in:
Wladimir J. van der Laan
2015-11-27 13:26:57 +01:00
parent 0e935865b9 2e29e7e247
commit 5ca149a3db
5 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/test_bitcoin.cpp
View File

@@ -51,6 +51,7 @@ BasicTestingSetup::~BasicTestingSetup()
TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
{
const CChainParams& chainparams = Params();
#ifdef ENABLE_WALLET
bitdb.MakeMock();
#endif
@@ -61,7 +62,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
pblocktree = new CBlockTreeDB(1 << 20, true);
pcoinsdbview = new CCoinsViewDB(1 << 23, true);
pcoinsTip = new CCoinsViewCache(pcoinsdbview);
InitBlockIndex();
InitBlockIndex(chainparams);
#ifdef ENABLE_WALLET
bool fFirstRun;
pwalletMain = new CWallet("wallet.dat");