GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:15 +00:00
commit 5f280a6068
22 changed files with 248 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/setup_common.cpp
View file

@ -141,7 +141,7 @@ TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)
{
// CreateAndProcessBlock() does not support building SegWit blocks, so don't activate in these tests.
// TODO: fix the code to support SegWit blocks.
gArgs.ForceSetArg("-vbparams", strprintf("segwit:0:%d", (int64_t)Consensus::BIP9Deployment::NO_TIMEOUT));
gArgs.ForceSetArg("-segwitheight", "432");
SelectParams(CBaseChainParams::REGTEST);
// Generate a 100-block chain: