Also restart MNs which didn't have the collateral moved, but do it later (#2483)

This commit is contained in:
Alexander Block 2018-11-23 16:45:56 +01:00 committed by GitHub
parent fa8f4a10cc
commit f5beeafa14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -169,6 +169,7 @@ class DIP3Test(BitcoinTestFramework):
first_upgrade_count = 5
mns_after_upgrade = []
mns_to_restart = []
mns_to_restart_later = []
mns_protx = []
print("upgrading first %d MNs to use ProTx (but not deterministic MN lists)" % first_upgrade_count)
for i in range(first_upgrade_count):
@ -183,6 +184,7 @@ class DIP3Test(BitcoinTestFramework):
else:
# collateral has not moved, so it should still be in the masternode list even after upgrade
mns_after_upgrade.append(mns[i])
mns_to_restart_later.append(mns[i])
mns_protx.append(mns[i])
for i in range(first_upgrade_count, len(mns)):
mns_after_upgrade.append(mns[i])
@ -214,6 +216,14 @@ class DIP3Test(BitcoinTestFramework):
print("testing instant send (with mixed ProTx and legacy nodes)")
self.test_instantsend(10, 5)
# We still need to restart them as otherwise they won't have the BLS operator key loaded
print("restart upgraded nodes which refer to old collaterals")
for mn in mns_to_restart_later:
print("restarting MN %s" % mn.alias)
self.stop_node(mn.idx)
self.start_mn(mn)
self.force_finish_mnsync_list(mn.node)
print("activating spork15")
height = self.nodes[0].getblockchaininfo()['blocks']
spork15_offset = 10