phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 03:03:22 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: Reset global args between test suites

Browse source
This commit is contained in:
MarcoFalke 2019-11-04 11:00:37 -05:00
parent fba574c908
commit fa07b8beb5
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/test/setup_common.cpp
View file

@ -129,6 +129,7 @@ TestChain100Setup::TestChain100Setup()
// CreateAndProcessBlock() does not support building SegWit blocks, so don't activate in these tests. // CreateAndProcessBlock() does not support building SegWit blocks, so don't activate in these tests.
// TODO: fix the code to support SegWit blocks. // TODO: fix the code to support SegWit blocks.
gArgs.ForceSetArg("-segwitheight", "432"); gArgs.ForceSetArg("-segwitheight", "432");
// Need to recreate chainparams
SelectParams(CBaseChainParams::REGTEST); SelectParams(CBaseChainParams::REGTEST);
// Generate a 100-block chain: // Generate a 100-block chain:
@ -142,12 +143,9 @@ TestChain100Setup::TestChain100Setup()
} }
} }
//
// Create a new block with just given transactions, coinbase paying to // Create a new block with just given transactions, coinbase paying to
// scriptPubKey, and try to add it to the current chain. // scriptPubKey, and try to add it to the current chain.
// CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
CBlock
TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey)
{ {
const CChainParams& chainparams = Params(); const CChainParams& chainparams = Params();
std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey); std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
@ -175,6 +173,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
TestChain100Setup::~TestChain100Setup() TestChain100Setup::~TestChain100Setup()
{ {
gArgs.ForceSetArg("-segwitheight", "0");
} }