zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Missing NU4->Canopy renames. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2020-05-29 10:02:50 +01:00
parent 22b8574d9e
commit 1527e5b3ca
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qa/rpc-tests/post_heartwood_rollback.py
View File

@ -18,14 +18,14 @@ from test_framework.util import (
start_nodes, start_nodes,
BLOSSOM_BRANCH_ID, BLOSSOM_BRANCH_ID,
HEARTWOOD_BRANCH_ID, HEARTWOOD_BRANCH_ID,
NU4_BRANCH_ID, CANOPY_BRANCH_ID,
) )
import logging import logging
import time import time
HAS_NU4 = [nuparams(BLOSSOM_BRANCH_ID, 205), nuparams(HEARTWOOD_BRANCH_ID, 210), nuparams(NU4_BRANCH_ID, 220), '-nurejectoldversions=false'] HAS_CANOPY = [nuparams(BLOSSOM_BRANCH_ID, 205), nuparams(HEARTWOOD_BRANCH_ID, 210), nuparams(CANOPY_BRANCH_ID, 220), '-nurejectoldversions=false']
NO_NU4 = [nuparams(BLOSSOM_BRANCH_ID, 205), nuparams(HEARTWOOD_BRANCH_ID, 210), '-nurejectoldversions=false'] NO_CANOPY = [nuparams(BLOSSOM_BRANCH_ID, 205), nuparams(HEARTWOOD_BRANCH_ID, 210), '-nurejectoldversions=false']
class PostHeartwoodRollbackTest (BitcoinTestFramework): class PostHeartwoodRollbackTest (BitcoinTestFramework):
@ -35,10 +35,10 @@ class PostHeartwoodRollbackTest (BitcoinTestFramework):
def setup_nodes(self): def setup_nodes(self):
return start_nodes(4, self.options.tmpdir, extra_args=[ return start_nodes(4, self.options.tmpdir, extra_args=[
HAS_NU4, HAS_CANOPY,
HAS_NU4, HAS_CANOPY,
NO_NU4, NO_CANOPY,
NO_NU4 NO_CANOPY
]) ])
def run_test (self): def run_test (self):
@ -49,17 +49,17 @@ class PostHeartwoodRollbackTest (BitcoinTestFramework):
self.nodes[0].generate(15) self.nodes[0].generate(15)
self.sync_all() self.sync_all()
# Split network at block 215 (after Heartwood, before NU4) # Split network at block 215 (after Heartwood, before Canopy)
print("Splitting network at block 215 (after Heartwood, before NU4)") print("Splitting network at block 215 (after Heartwood, before Canopy)")
self.split_network() self.split_network()
# Activate NU4 on node 0 # Activate Canopy on node 0
print("Activating NU4 on node 0") print("Activating Canopy on node 0")
self.nodes[0].generate(5) self.nodes[0].generate(5)
self.sync_all() self.sync_all()
# Mine past NU4 activation height on node 2 # Mine past Canopy activation height on node 2
print("Mining past NU4 activation height on node 2 ") print("Mining past Canopy activation height on node 2 ")
self.nodes[2].generate(20) self.nodes[2].generate(20)
self.sync_all() self.sync_all()
@ -72,15 +72,15 @@ class PostHeartwoodRollbackTest (BitcoinTestFramework):
# print("\n before shutdown node: ", i, "block: ", j, "\n") # print("\n before shutdown node: ", i, "block: ", j, "\n")
# print(self.nodes[i].getblock(str(j))) # print(self.nodes[i].getblock(str(j)))
# Upgrade node 2 and 3 to NU4 # Upgrade node 2 and 3 to Canopy
print("Upgrading nodes 2 and 3 to NU4") print("Upgrading nodes 2 and 3 to Canopy")
self.nodes[2].stop() self.nodes[2].stop()
bitcoind_processes[2].wait() bitcoind_processes[2].wait()
self.nodes[2] = start_node(2, self.options.tmpdir, extra_args=HAS_NU4) self.nodes[2] = start_node(2, self.options.tmpdir, extra_args=HAS_CANOPY)
self.nodes[3].stop() self.nodes[3].stop()
bitcoind_processes[3].wait() bitcoind_processes[3].wait()
self.nodes[3] = start_node(3, self.options.tmpdir, extra_args=HAS_NU4) self.nodes[3] = start_node(3, self.options.tmpdir, extra_args=HAS_CANOPY)
# for i in range (0,3,2): # for i in range (0,3,2):
# blockcount = self.nodes[i].getblockcount() # blockcount = self.nodes[i].getblockcount()