Updated to reflect bitcoin version

test/functional/feature_anchors.py

@@ -64,14 +64,15 @@ def run_test(self):
         self.log.info("Check the addresses in anchors.dat")
 
         with open(node_anchors_path, "rb") as file_handler:
-            anchors = file_handler.read().hex()
+            anchors = file_handler.read()
 
+        anchors_hex = anchors.hex()
         for port in block_relay_nodes_port:
             ip_port = ip + port
-            assert ip_port in anchors
+            assert ip_port in anchors_hex
         for port in inbound_nodes_port:
             ip_port = ip + port
-            assert ip_port not in anchors
+            assert ip_port not in anchors_hex
 
         self.log.info("Perturb anchors.dat to test it doesn't throw an error during initialization")
         with self.nodes[0].assert_debug_log(["0 block-relay-only anchors will be tried for connections."]):

test/functional/test_framework/blocktools.py

@@ -43,10 +43,6 @@
     keys_to_multisig_script,
     script_to_p2wsh_script,
 )
-from .script_util import (
-    key_to_p2wpkh_script,
-    script_to_p2wsh_script,
-)
 from .util import assert_equal
 
 WITNESS_SCALE_FACTOR = 4

test/functional/test_framework/messages.py

@@ -70,9 +70,19 @@
 
 WITNESS_SCALE_FACTOR = 4
 
+DEFAULT_ANCESTOR_LIMIT = 25    # default max number of in-mempool ancestors
+DEFAULT_DESCENDANT_LIMIT = 25  # default max number of in-mempool descendants
+
+# Default setting for -datacarriersize. 80 bytes of data, +1 for OP_RETURN, +2 for the pushdata opcodes.
+MAX_OP_RETURN_RELAY = 83
+
+DEFAULT_MEMPOOL_EXPIRY_HOURS = 336  # hours
+
 # Serialization/deserialization tools
 def keccak256(s):
-    h = sha3.keccak_256()
+    from sha3 import keccak_256
+    #print(dir(sha3))
+    h = keccak_256()
     h.update(s)
     return h.digest()