diff options
| author | John Newbery <john@johnnewbery.com> | 2019-05-20 14:59:07 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-08-14 15:52:52 -0400 |
| commit | 0328dcdcfcb56dc8918697716d7686be048ad0b3 (patch) | |
| tree | c4c4bed225e5d08d9af5f007941ab5261147e256 /src/test | |
| parent | 1c93b9b31c2ab7358f9d55f52dd46340397c906d (diff) | |
| download | bitcoin-0328dcdcfcb56dc8918697716d7686be048ad0b3.tar.xz | |
[Consensus] Bury segwit deployment
Hardcode segwit deployment height to 481824 for mainnet.
Diffstat (limited to 'src/test')
| -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 de877fd167..4d928264b7 100644 --- a/src/test/setup_common.cpp +++ b/src/test/setup_common.cpp @@ -122,7 +122,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: |