highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-30 10:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Consensus] Bury segwit deployment

Browse Source 
Hardcode segwit deployment height to 481824 for mainnet.
This commit is contained in:
John Newbery
2019-05-20 14:59:07 -04:00
parent 1c93b9b31c
commit 0328dcdcfc
15 changed files with 71 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/p2p_compactblocks.py
View File

@ -14,7 +14,7 @@ from test_framework.messages import BlockTransactions, BlockTransactionsRequest,
from test_framework.mininode import mininode_lock, P2PInterface
from test_framework.script import CScript, OP_TRUE, OP_DROP
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal, get_bip9_status, wait_until
from test_framework.util import assert_equal, wait_until, softfork_active
# TestP2PConn: A peer we use to send messages to bitcoind, and store responses.
class TestP2PConn(P2PInterface):
@ -803,7 +803,7 @@ class CompactBlocksTest(BitcoinTestFramework):
# We will need UTXOs to construct transactions in later tests.
self.make_utxos()
assert_equal(get_bip9_status(self.nodes[0], "segwit")["status"], 'active')
assert softfork_active(self.nodes[0], "segwit")
self.log.info("Testing SENDCMPCT p2p message... ")
self.test_sendcmpct(self.segwit_node, old_node=self.old_node)