diff --git a/test/functional/feature_confidential_transactions.py b/test/functional/feature_confidential_transactions.py index 2c7695b4da..1d0dcdbb0b 100755 --- a/test/functional/feature_confidential_transactions.py +++ b/test/functional/feature_confidential_transactions.py @@ -42,7 +42,6 @@ class CTTest (BitcoinTestFramework): connect_nodes_bi(self.nodes, 0, 1) connect_nodes_bi(self.nodes, 1, 2) connect_nodes_bi(self.nodes, 0, 2) - self.is_network_split = False self.sync_all() def skip_test_if_missing_module(self): diff --git a/test/functional/feature_default_asset_name.py b/test/functional/feature_default_asset_name.py index 860c4368f2..5718d3306d 100755 --- a/test/functional/feature_default_asset_name.py +++ b/test/functional/feature_default_asset_name.py @@ -26,7 +26,6 @@ class NamedDefaultAssetTest(BitcoinTestFramework): def setup_network(self, split=False): self.setup_nodes() connect_nodes_bi(self.nodes, 0, 1) - self.is_network_split = False self.sync_all() def skip_test_if_missing_module(self): diff --git a/test/functional/feature_initial_reissuance_token.py b/test/functional/feature_initial_reissuance_token.py index aa791c82fc..5c4a0a5e9a 100755 --- a/test/functional/feature_initial_reissuance_token.py +++ b/test/functional/feature_initial_reissuance_token.py @@ -29,7 +29,6 @@ class InitialReissuanceTokenTest(BitcoinTestFramework): def setup_network(self, split=False): self.setup_nodes() connect_nodes_bi(self.nodes, 0, 1) - self.is_network_split = False self.sync_all() def run_test(self): diff --git a/test/functional/feature_issuance.py b/test/functional/feature_issuance.py index 98065e96c5..661006f415 100755 --- a/test/functional/feature_issuance.py +++ b/test/functional/feature_issuance.py @@ -101,7 +101,6 @@ class IssuanceTest(BitcoinTestFramework): self.setup_nodes() connect_nodes_bi(self.nodes, 0, 1) connect_nodes_bi(self.nodes, 1, 2) - self.is_network_split = False self.sync_all() def run_test(self): diff --git a/test/functional/feature_mandatory_coinbase.py b/test/functional/feature_mandatory_coinbase.py index b918b1849f..488ec01cc0 100755 --- a/test/functional/feature_mandatory_coinbase.py +++ b/test/functional/feature_mandatory_coinbase.py @@ -14,7 +14,7 @@ from test_framework.util import assert_equal, assert_raises_rpc_error mandatory_privkey = "cQ2nfMkghhdEgRQwcfJmTb6XSenfLRmngpLmWuEBAJnepnKMfznH" mandatory_address = "XP3bwB9jSxt58frSa3cJismgGL3F57ukUy" -mandatory_pubkey = "024f0c5cdb8f31d7395bcc83f6adc46f292f6555eca2d24dfa581c3b0845778b2b" +#mandatory_pubkey = "024f0c5cdb8f31d7395bcc83f6adc46f292f6555eca2d24dfa581c3b0845778b2b" mandatory_script = "a914804b9fd9d6939c2e960b7aa31124a5d532f4e59c87" def b2x(b): diff --git a/test/functional/feature_pak.py b/test/functional/feature_pak.py index f03b67d8e2..be1d1b8da8 100755 --- a/test/functional/feature_pak.py +++ b/test/functional/feature_pak.py @@ -65,7 +65,7 @@ class PAKTest (BitcoinTestFramework): # This function tests the result of the getpakinfo RPC. # *_pak is either False (undefined paklist), "reject" or a list of # (online, offline) tuples - def test_pak(node, config_pak, block_pak, validate): + def test_pak(node, config_pak, block_pak): getpakinfo = node.getpakinfo() def compare(actual, expected): @@ -85,11 +85,11 @@ class PAKTest (BitcoinTestFramework): compare(getpakinfo['block_paklist'], block_pak) # In the beginning the blockchain paklist is "reject" - test_pak(self.nodes[i_novalidate], pak1, "reject", False) - test_pak(self.nodes[i_undefined], False, "reject", True) - test_pak(self.nodes[i_pak1], pak1, "reject", True) - test_pak(self.nodes[i_pak2], pak2, "reject", True) - test_pak(self.nodes[i_reject], "reject", "reject", True) + test_pak(self.nodes[i_novalidate], pak1, "reject") + test_pak(self.nodes[i_undefined], False, "reject") + test_pak(self.nodes[i_pak1], pak1, "reject") + test_pak(self.nodes[i_pak2], pak2, "reject") + test_pak(self.nodes[i_reject], "reject", "reject") # i_novalidate creates block without a commitment block_proposal = self.nodes[i_novalidate].getnewblockhex() @@ -121,11 +121,11 @@ class PAKTest (BitcoinTestFramework): # Submit block with commitment to pak1 and check each node's state. self.nodes[i_undefined].submitblock(block_proposal) self.sync_all() - test_pak(self.nodes[i_novalidate], pak1, pak1, False) - test_pak(self.nodes[i_undefined], False, pak1, True) - test_pak(self.nodes[i_pak1], pak1, pak1, True) - test_pak(self.nodes[i_pak2], pak2, pak1, True) - test_pak(self.nodes[i_reject], "reject", pak1, True) + test_pak(self.nodes[i_novalidate], pak1, pak1) + test_pak(self.nodes[i_undefined], False, pak1) + test_pak(self.nodes[i_pak1], pak1, pak1) + test_pak(self.nodes[i_pak2], pak2, pak1) + test_pak(self.nodes[i_reject], "reject", pak1) # Check that another block by i_pak1 (without a commitment) is valid to # i_pak1 but invalid to i_pak2 and i_reject block_proposal = self.nodes[i_undefined].getnewblockhex() @@ -150,11 +150,11 @@ class PAKTest (BitcoinTestFramework): # Submit "reject" block and check state. self.nodes[i_undefined].submitblock(block_proposal) self.sync_all() - test_pak(self.nodes[i_novalidate], pak1, "reject", False) - test_pak(self.nodes[i_undefined], False, "reject", True) - test_pak(self.nodes[i_pak1], pak1, "reject", True) - test_pak(self.nodes[i_pak2], pak2, "reject", True) - test_pak(self.nodes[i_reject], "reject", "reject", True) + test_pak(self.nodes[i_novalidate], pak1, "reject") + test_pak(self.nodes[i_undefined], False, "reject") + test_pak(self.nodes[i_pak1], pak1, "reject") + test_pak(self.nodes[i_pak2], pak2, "reject") + test_pak(self.nodes[i_reject], "reject", "reject") # Check that another block by i_reject (without a commitment) is valid to i_reject. block_proposal = self.nodes[i_reject].getnewblockhex() assert_equal(self.nodes[i_reject].testproposedblock(block_proposal), None) @@ -182,7 +182,7 @@ class PAKTest (BitcoinTestFramework): connect_nodes_bi(self.nodes,3,4) # Check current state of i_pak1 - test_pak(self.nodes[i_pak1], pak2, "reject", True) + test_pak(self.nodes[i_pak1], pak2, "reject") # Create a new block with i_pak1 which should have a commitment to pak2 # and check that it's correctly rejected or accepted. block_proposal = self.nodes[i_pak1].getnewblockhex() @@ -196,11 +196,11 @@ class PAKTest (BitcoinTestFramework): # Submit block with commitment to pak2 and check state. self.nodes[i_pak1].submitblock(block_proposal) self.sync_all() - test_pak(self.nodes[i_novalidate], "reject", pak2, False) - test_pak(self.nodes[i_undefined], False, pak2, True) - test_pak(self.nodes[i_pak1], pak2, pak2, True) - test_pak(self.nodes[i_pak2], pak2, pak2, True) - test_pak(self.nodes[i_reject], "reject", pak2, True) + test_pak(self.nodes[i_novalidate], "reject", pak2) + test_pak(self.nodes[i_undefined], False, pak2) + test_pak(self.nodes[i_pak1], pak2, pak2) + test_pak(self.nodes[i_pak2], pak2, pak2) + test_pak(self.nodes[i_reject], "reject", pak2) # Reset PAK conf arguments to start to test mempool acceptance and wallet diff --git a/test/functional/feature_progress.py b/test/functional/feature_progress.py index 3c565110c4..4ed1f9651e 100755 --- a/test/functional/feature_progress.py +++ b/test/functional/feature_progress.py @@ -28,7 +28,6 @@ class ProgressTest(BitcoinTestFramework): def setup_network(self): self.setup_nodes() - self.is_network_split = True self.starttime = int(time.time()) def setmocktime(self, ntime): diff --git a/test/functional/rpc_calcfastmerkleroot.py b/test/functional/rpc_calcfastmerkleroot.py index 0e5c9f9fec..74a997fbaf 100755 --- a/test/functional/rpc_calcfastmerkleroot.py +++ b/test/functional/rpc_calcfastmerkleroot.py @@ -11,6 +11,7 @@ class CalcFastMerkleRoot(BitcoinTestFramework): def run_test(self): util.node_fastmerkle = self.nodes[0] + print(util.node_fastmerkle) # to avoid the dead code linter in all tests that use this test_leaves = ["b66b041650db0f297b53f8d93c0e8706925bf3323f8c59c14a6fac37bfdcd06f", "99cb2fa68b2294ae133550a9f765fc755d71baa7b24389fed67d1ef3e5cb0255", "257e1b2fa49dd15724c67bac4df7911d44f6689860aa9f65a881ae0a2f40a303", "b67b0b9f093fa83d5e44b707ab962502b7ac58630e556951136196e65483bb80"] test_roots = ["0000000000000000000000000000000000000000000000000000000000000000", "b66b041650db0f297b53f8d93c0e8706925bf3323f8c59c14a6fac37bfdcd06f", "f752938da0cb71c051aabdd5a86658e8d0b7ac00e1c2074202d8d2a79d8a6cf6", "245d364a28e9ad20d522c4a25ffc6a7369ab182f884e1c7dcd01aa3d32896bd3", "317d6498574b6ca75ee0368ec3faec75e096e245bdd5f36e8726fa693f775dfc"] diff --git a/test/functional/test_framework/liquid_addr.py b/test/functional/test_framework/liquid_addr.py index c8ae77275b..2971f899b5 100644 --- a/test/functional/test_framework/liquid_addr.py +++ b/test/functional/test_framework/liquid_addr.py @@ -13,7 +13,7 @@ def blech32_polymod(values): chk = 1 for value in values: top = chk >> 55 # 25->55 - chk = ((chk & 0x7fffffffffffff) << 5) ^^ value # 0x1ffffff->0x7fffffffffffff + chk = ((chk & 0x7fffffffffffff) << 5) ^ value # 0x1ffffff->0x7fffffffffffff for i in range(5): chk ^= generator[i] if ((top >> i) & 1) else 0 return chk @@ -32,7 +32,7 @@ def blech32_verify_checksum(hrp, data): def blech32_create_checksum(hrp, data): """Compute the checksum values given HRP and data.""" values = blech32_hrp_expand(hrp) + data - polymod = blech32_polymod(values + [0]*12) ^^ 1 # 6->12 + polymod = blech32_polymod(values + [0]*12) ^ 1 # 6->12 return [(polymod >> 5 * (11 - i)) & 31 for i in range(12)] # ^ 5 ^ 6 diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 34b6c083b1..322de2f6b7 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -414,10 +414,10 @@ class CTxOutAsset: r += self.vchCommitment return r - def setToAsset(self, val): - if len(val) != 32: - raise 'invalid asset hash (expected 32 bytes got %d)' % len(val) - self.vchCommitment = b'\x01' + val + #def setToAsset(self, val): + # if len(val) != 32: + # raise 'invalid asset hash (expected 32 bytes got %d)' % len(val) + # self.vchCommitment = b'\x01' + val def __repr__(self): return "CTxOutAsset(vchCommitment=%s)" % self.vchCommitment