diff --git a/test/functional/abc-invalid-message.py b/test/functional/abc-invalid-message.py
index b9aedc7f3..cf187ca0c 100755
--- a/test/functional/abc-invalid-message.py
+++ b/test/functional/abc-invalid-message.py
@@ -1,101 +1,100 @@
 #!/usr/bin/env python3
 # Copyright (c) 2019 The Bitcoin developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """ABC Invalid Message Test
 
 Test that invalid messages get rejected and/or ban the sender as expected for
 each case.
 """
 
 import struct
 
 from test_framework.messages import NODE_NETWORK, msg_version
 from test_framework.p2p import (
-    p2p_lock,
     msg_ping,
     P2PInterface,
 )
 from test_framework.test_framework import BitcoinTestFramework
 
 
 def msg_bad_checksum(connection, original_message):
     message_data = bytearray(connection.build_message(original_message))
 
     data = original_message.serialize()
     i = 0
     i += len(connection.magic_bytes)
     i += 12
     i += len(struct.pack("<I", len(data)))
 
     # Make the checksum invalid
     message_data[i] = message_data[i] ^ 0xAA
     return message_data
 
 
 class BadVersionP2PInterface(P2PInterface):
     def peer_connect(self, *args, services=NODE_NETWORK,
                      send_version=False, **kwargs):
         create_conn = super().peer_connect(*args, send_version=send_version, **kwargs)
 
         # Send version message with invalid checksum
         vt = msg_version()
         vt.nServices = services
         vt.addrTo.ip = self.dstaddr
         vt.addrTo.port = self.dstport
         vt.addrFrom.ip = "0.0.0.0"
         vt.addrFrom.port = 0
         invalid_vt = msg_bad_checksum(self, vt)
         # Will be sent right after connection_made
         self.on_connection_send_msg = invalid_vt
         self.on_connection_send_msg_is_raw = True
 
         return create_conn
 
 
 class InvalidMessageTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = False
         self.num_nodes = 2
 
     def run_test(self):
         # Try to connect to a node using an invalid checksum on version message
         bad_interface = BadVersionP2PInterface()
         self.nodes[0].add_p2p_connection(
             bad_interface, send_version=False, wait_for_verack=False)
 
         # Also connect to a node with a valid version message
         interface = P2PInterface()
         # Node with valid version message should connect successfully
         connection = self.nodes[1].add_p2p_connection(interface)
 
         # The invalid version message should cause a disconnect on the first
         # connection because we are now banned
         bad_interface.wait_for_disconnect()
 
         # Create a valid message
         valid_message = msg_ping(interface.ping_counter)
 
         def wait_for_ping():
             def check_ping():
                 if not interface.last_message.get("pong"):
                     return False
                 return interface.last_message["pong"].nonce == interface.ping_counter
-            self.wait_until(check_ping, lock=p2p_lock)
+            interface.wait_until(check_ping)
             interface.ping_counter += 1
 
         # The valid message is accepted
         connection.send_message(valid_message)
         wait_for_ping()
 
         # Make an invalid copy of the valid message with an invalid checksum
         invalid_message = msg_bad_checksum(connection, valid_message)
 
         # The invalid message should cause a disconnect because we are now
         # banned
         connection.send_raw_message(invalid_message)
         interface.wait_for_disconnect()
 
 
 if __name__ == '__main__':
     InvalidMessageTest().main()
diff --git a/test/functional/p2p_leak.py b/test/functional/p2p_leak.py
index e4825f618..b94e0a529 100755
--- a/test/functional/p2p_leak.py
+++ b/test/functional/p2p_leak.py
@@ -1,193 +1,189 @@
 #!/usr/bin/env python3
 # Copyright (c) 2017-2019 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test message sending before handshake completion.
 
 A node should never send anything other than VERSION/VERACK until it's
 received a VERACK.
 
 This test connects to a node and sends it a few messages, trying to entice it
 into sending us something it shouldn't.
 """
 
 import time
 
 from test_framework.messages import (
     msg_getaddr,
     msg_ping,
     msg_version,
 )
-from test_framework.p2p import (
-    p2p_lock,
-    P2PInterface,
-)
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     assert_greater_than_or_equal,
 )
 
 DISCOURAGEMENT_THRESHOLD = 10
 
 
 class LazyPeer(P2PInterface):
     def __init__(self):
         super().__init__()
         self.unexpected_msg = False
         self.ever_connected = False
 
     def bad_message(self, message):
         self.unexpected_msg = True
         self.log.info(
             "should not have received message: {}".format(message.msgtype))
 
     def on_open(self):
         self.ever_connected = True
 
     # Does not respond to "version" with "verack"
     def on_version(self, message): self.bad_message(message)
 
     def on_verack(self, message): self.bad_message(message)
 
     def on_inv(self, message): self.bad_message(message)
 
     def on_addr(self, message): self.bad_message(message)
 
     def on_getdata(self, message): self.bad_message(message)
 
     def on_getblocks(self, message): self.bad_message(message)
 
     def on_tx(self, message): self.bad_message(message)
 
     def on_block(self, message): self.bad_message(message)
 
     def on_getaddr(self, message): self.bad_message(message)
 
     def on_headers(self, message): self.bad_message(message)
 
     def on_getheaders(self, message): self.bad_message(message)
 
     def on_ping(self, message): self.bad_message(message)
 
     def on_mempool(self, message): self.bad_message(message)
 
     def on_pong(self, message): self.bad_message(message)
 
     def on_feefilter(self, message): self.bad_message(message)
 
     def on_sendheaders(self, message): self.bad_message(message)
 
     def on_sendcmpct(self, message): self.bad_message(message)
 
     def on_cmpctblock(self, message): self.bad_message(message)
 
     def on_getblocktxn(self, message): self.bad_message(message)
 
     def on_blocktxn(self, message): self.bad_message(message)
 
 
 # Peer that sends a version but not a verack.
 class NoVerackIdlePeer(LazyPeer):
     def __init__(self):
         self.version_received = False
         super().__init__()
 
     def on_verack(self, message): pass
     # When version is received, don't reply with a verack. Instead, see if the
     # node will give us a message that it shouldn't. This is not an exhaustive
     # list!
 
     def on_version(self, message):
         self.version_received = True
         self.send_message(msg_ping())
         self.send_message(msg_getaddr())
 
 
 class P2PVersionStore(P2PInterface):
     version_received = None
 
     def on_version(self, msg):
         # Responds with an appropriate verack
         super().on_version(msg)
         self.version_received = msg
 
 
 class P2PLeakTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
 
     def run_test(self):
         # Peer that never sends a version. We will send a bunch of messages
         # from this peer anyway and verify eventual disconnection.
         no_version_disconnect_peer = self.nodes[0].add_p2p_connection(
             LazyPeer(), send_version=False, wait_for_verack=False)
 
         # Another peer that never sends a version, nor any other messages.
         # It shouldn't receive anything from the node.
         no_version_idle_peer = self.nodes[0].add_p2p_connection(
             LazyPeer(), send_version=False, wait_for_verack=False)
 
         # Peer that sends a version but not a verack.
         no_verack_idle_peer = self.nodes[0].add_p2p_connection(
             NoVerackIdlePeer(), wait_for_verack=False)
 
         # Send enough ping messages (any non-version message will do) prior
         # to sending version to reach the peer discouragement threshold. This
         # should get us disconnected.
         for _ in range(DISCOURAGEMENT_THRESHOLD):
             no_version_disconnect_peer.send_message(msg_ping())
 
         # Wait until we got the verack in response to the version. Though, don't wait for the node to receive the
         # verack, since we never sent one
         no_verack_idle_peer.wait_for_verack()
 
-        self.wait_until(
+        no_version_disconnect_peer.wait_until(
             lambda: no_version_disconnect_peer.ever_connected,
-            timeout=10,
-            lock=p2p_lock)
-        self.wait_until(lambda: no_version_idle_peer.ever_connected,
-                        timeout=10, lock=p2p_lock)
-        self.wait_until(lambda: no_verack_idle_peer.version_received,
-                        timeout=10, lock=p2p_lock)
+            check_connected=False)
+        no_version_idle_peer.wait_until(
+            lambda: no_version_idle_peer.ever_connected)
+        no_verack_idle_peer.wait_until(
+            lambda: no_verack_idle_peer.version_received)
 
         # Mine a block and make sure that it's not sent to the connected peers
         self.nodes[0].generate(nblocks=1)
 
         # Give the node enough time to possibly leak out a message
         time.sleep(5)
 
         # Expect this peer to be disconnected for misbehavior
         assert not no_version_disconnect_peer.is_connected
 
         self.nodes[0].disconnect_p2ps()
 
         # Make sure no unexpected messages came in
         assert not no_version_disconnect_peer.unexpected_msg
         assert not no_version_idle_peer.unexpected_msg
         assert not no_verack_idle_peer.unexpected_msg
 
         self.log.info(
             'Check that the version message does not leak the local address of the node')
         p2p_version_store = self.nodes[0].add_p2p_connection(P2PVersionStore())
         ver = p2p_version_store.version_received
         # Check that received time is within one hour of now
         assert_greater_than_or_equal(ver.nTime, time.time() - 3600)
         assert_greater_than_or_equal(time.time() + 3600, ver.nTime)
         assert_equal(ver.addrFrom.port, 0)
         assert_equal(ver.addrFrom.ip, '0.0.0.0')
         assert_equal(ver.nStartingHeight, 201)
         assert_equal(ver.nRelay, 1)
 
         self.log.info('Check that old peers are disconnected')
         p2p_old_peer = self.nodes[0].add_p2p_connection(
             P2PInterface(), send_version=False, wait_for_verack=False)
         old_version_msg = msg_version()
         old_version_msg.nVersion = 31799
         with self.nodes[0].assert_debug_log(['peer=4 using obsolete version 31799; disconnecting']):
             p2p_old_peer.send_message(old_version_msg)
             p2p_old_peer.wait_for_disconnect()
 
 
 if __name__ == '__main__':
     P2PLeakTest().main()
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 9d4c70a12..bc8c5dbf5 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -1,792 +1,792 @@
 #!/usr/bin/env python3
 # Copyright (c) 2014-2019 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Base class for RPC testing."""
 
 import argparse
 import configparser
 from enum import Enum
 import logging
 import os
 import pdb
 import random
 import shutil
 import sys
 import tempfile
 import time
 from typing import Optional
 
 from .authproxy import JSONRPCException
 from .avatools import get_proof_ids
 from . import coverage
 from .p2p import NetworkThread
 from .test_node import TestNode
 from .util import (
     assert_equal,
     check_json_precision,
     connect_nodes,
     disconnect_nodes,
     get_datadir_path,
     initialize_datadir,
     MAX_NODES,
     p2p_port,
     PortSeed,
     rpc_port,
     wait_until_helper,
 )
 
 
 class TestStatus(Enum):
     PASSED = 1
     FAILED = 2
     SKIPPED = 3
 
 
 TEST_EXIT_PASSED = 0
 TEST_EXIT_FAILED = 1
 TEST_EXIT_SKIPPED = 77
 
 # Timestamp is Dec. 1st, 2019 at 00:00:00
 TIMESTAMP_IN_THE_PAST = 1575158400
 
 TMPDIR_PREFIX = "bitcoin_func_test_"
 
 
 class SkipTest(Exception):
     """This exception is raised to skip a test"""
 
     def __init__(self, message):
         self.message = message
 
 
 class BitcoinTestMetaClass(type):
     """Metaclass for BitcoinTestFramework.
 
     Ensures that any attempt to register a subclass of `BitcoinTestFramework`
     adheres to a standard whereby the subclass overrides `set_test_params` and
     `run_test` but DOES NOT override either `__init__` or `main`. If any of
     those standards are violated, a ``TypeError`` is raised."""
 
     def __new__(cls, clsname, bases, dct):
         if not clsname == 'BitcoinTestFramework':
             if not ('run_test' in dct and 'set_test_params' in dct):
                 raise TypeError("BitcoinTestFramework subclasses must override "
                                 "'run_test' and 'set_test_params'")
             if '__init__' in dct or 'main' in dct:
                 raise TypeError("BitcoinTestFramework subclasses may not override "
                                 "'__init__' or 'main'")
 
         return super().__new__(cls, clsname, bases, dct)
 
 
 class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
     """Base class for a bitcoin test script.
 
     Individual bitcoin test scripts should subclass this class and override the set_test_params() and run_test() methods.
 
     Individual tests can also override the following methods to customize the test setup:
 
     - add_options()
     - setup_chain()
     - setup_network()
     - setup_nodes()
 
     The __init__() and main() methods should not be overridden.
 
     This class also contains various public and private helper methods."""
 
     chain: Optional[str] = None
     setup_clean_chain: Optional[bool] = None
 
     def __init__(self):
         """Sets test framework defaults. Do not override this method. Instead, override the set_test_params() method"""
         self.chain = 'regtest'
         self.setup_clean_chain = False
         self.nodes = []
         self.network_thread = None
         # Wait for up to 60 seconds for the RPC server to respond
         self.rpc_timeout = 60
         self.supports_cli = True
         self.bind_to_localhost_only = True
         # We run parse_args before set_test_params for tests who need to
         # know the parser options during setup.
         self.parse_args()
         self.set_test_params()
         if self.options.timeout_factor == 0:
             self.options.timeout_factor = 99999
         # optionally, increase timeout by a factor
         self.rpc_timeout = int(self.rpc_timeout * self.options.timeout_factor)
 
     def main(self):
         """Main function. This should not be overridden by the subclass test scripts."""
         assert hasattr(
             self, "num_nodes"), "Test must set self.num_nodes in set_test_params()"
 
         try:
             self.setup()
             self.run_test()
         except JSONRPCException:
             self.log.exception("JSONRPC error")
             self.success = TestStatus.FAILED
         except SkipTest as e:
             self.log.warning("Test Skipped: {}".format(e.message))
             self.success = TestStatus.SKIPPED
         except AssertionError:
             self.log.exception("Assertion failed")
             self.success = TestStatus.FAILED
         except KeyError:
             self.log.exception("Key error")
             self.success = TestStatus.FAILED
         except Exception:
             self.log.exception("Unexpected exception caught during testing")
             self.success = TestStatus.FAILED
         except KeyboardInterrupt:
             self.log.warning("Exiting after keyboard interrupt")
             self.success = TestStatus.FAILED
         finally:
             exit_code = self.shutdown()
             sys.exit(exit_code)
 
     def parse_args(self):
         parser = argparse.ArgumentParser(usage="%(prog)s [options]")
         parser.add_argument("--nocleanup", dest="nocleanup", default=False, action="store_true",
                             help="Leave bitcoinds and test.* datadir on exit or error")
         parser.add_argument("--noshutdown", dest="noshutdown", default=False, action="store_true",
                             help="Don't stop bitcoinds after the test execution")
         parser.add_argument("--cachedir", dest="cachedir", default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../cache"),
                             help="Directory for caching pregenerated datadirs (default: %(default)s)")
         parser.add_argument("--tmpdir", dest="tmpdir",
                             help="Root directory for datadirs")
         parser.add_argument("-l", "--loglevel", dest="loglevel", default="INFO",
                             help="log events at this level and higher to the console. Can be set to DEBUG, INFO, WARNING, ERROR or CRITICAL. Passing --loglevel DEBUG will output all logs to console. Note that logs at all levels are always written to the test_framework.log file in the temporary test directory.")
         parser.add_argument("--tracerpc", dest="trace_rpc", default=False, action="store_true",
                             help="Print out all RPC calls as they are made")
         parser.add_argument("--portseed", dest="port_seed", default=os.getpid(), type=int,
                             help="The seed to use for assigning port numbers (default: current process id)")
         parser.add_argument("--coveragedir", dest="coveragedir",
                             help="Write tested RPC commands into this directory")
         parser.add_argument("--configfile", dest="configfile", default=os.path.abspath(os.path.dirname(os.path.realpath(
             __file__)) + "/../../config.ini"), help="Location of the test framework config file (default: %(default)s)")
         parser.add_argument("--pdbonfailure", dest="pdbonfailure", default=False, action="store_true",
                             help="Attach a python debugger if test fails")
         parser.add_argument("--usecli", dest="usecli", default=False, action="store_true",
                             help="use bitcoin-cli instead of RPC for all commands")
         parser.add_argument("--perf", dest="perf", default=False, action="store_true",
                             help="profile running nodes with perf for the duration of the test")
         parser.add_argument("--valgrind", dest="valgrind", default=False, action="store_true",
                             help="run nodes under the valgrind memory error detector: expect at least a ~10x slowdown, valgrind 3.14 or later required")
         parser.add_argument("--randomseed", type=int,
                             help="set a random seed for deterministically reproducing a previous test run")
         parser.add_argument("--with-axionactivation", dest="axionactivation", default=False, action="store_true",
                             help="Activate axion update on timestamp {}".format(TIMESTAMP_IN_THE_PAST))
         parser.add_argument(
             '--timeout-factor',
             dest="timeout_factor",
             type=float,
             default=1.0,
             help='adjust test timeouts by a factor. '
                  'Setting it to 0 disables all timeouts')
 
         self.add_options(parser)
         self.options = parser.parse_args()
 
     def setup(self):
         """Call this method to start up the test framework object with options set."""
         PortSeed.n = self.options.port_seed
 
         check_json_precision()
 
         self.options.cachedir = os.path.abspath(self.options.cachedir)
 
         config = configparser.ConfigParser()
         config.read_file(open(self.options.configfile, encoding='utf-8'))
         self.config = config
         fname_bitcoind = os.path.join(
             config["environment"]["BUILDDIR"],
             "src",
             "bitcoind" + config["environment"]["EXEEXT"]
         )
         fname_bitcoincli = os.path.join(
             config["environment"]["BUILDDIR"],
             "src",
             "bitcoin-cli" + config["environment"]["EXEEXT"]
         )
         self.options.bitcoind = os.getenv("BITCOIND", default=fname_bitcoind)
         self.options.bitcoincli = os.getenv(
             "BITCOINCLI", default=fname_bitcoincli)
         self.options.emulator = config["environment"]["EMULATOR"] or None
 
         os.environ['PATH'] = config['environment']['BUILDDIR'] + os.pathsep + \
             config['environment']['BUILDDIR'] + os.path.sep + "qt" + os.pathsep + \
             os.environ['PATH']
 
         # Set up temp directory and start logging
         if self.options.tmpdir:
             self.options.tmpdir = os.path.abspath(self.options.tmpdir)
             os.makedirs(self.options.tmpdir, exist_ok=False)
         else:
             self.options.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX)
         self._start_logging()
 
         # Seed the PRNG. Note that test runs are reproducible if and only if
         # a single thread accesses the PRNG. For more information, see
         # https://docs.python.org/3/library/random.html#notes-on-reproducibility.
         # The network thread shouldn't access random. If we need to change the
         # network thread to access randomness, it should instantiate its own
         # random.Random object.
         seed = self.options.randomseed
 
         if seed is None:
             seed = random.randrange(sys.maxsize)
         else:
             self.log.debug("User supplied random seed {}".format(seed))
 
         random.seed(seed)
         self.log.debug("PRNG seed is: {}".format(seed))
 
         self.log.debug('Setting up network thread')
         self.network_thread = NetworkThread()
         self.network_thread.start()
 
         if self.options.usecli:
             if not self.supports_cli:
                 raise SkipTest(
                     "--usecli specified but test does not support using CLI")
             self.skip_if_no_cli()
         self.skip_test_if_missing_module()
         self.setup_chain()
         self.setup_network()
 
         self.success = TestStatus.PASSED
 
     def shutdown(self):
         """Call this method to shut down the test framework object."""
         if self.success == TestStatus.FAILED and self.options.pdbonfailure:
             print("Testcase failed. Attaching python debugger. Enter ? for help")
             pdb.set_trace()
 
         self.log.debug('Closing down network thread')
         self.network_thread.close()
         if not self.options.noshutdown:
             self.log.info("Stopping nodes")
             if self.nodes:
                 self.stop_nodes()
         else:
             for node in self.nodes:
                 node.cleanup_on_exit = False
             self.log.info(
                 "Note: bitcoinds were not stopped and may still be running")
 
         should_clean_up = (
             not self.options.nocleanup and
             not self.options.noshutdown and
             self.success != TestStatus.FAILED and
             not self.options.perf
         )
         if should_clean_up:
             self.log.info("Cleaning up {} on exit".format(self.options.tmpdir))
             cleanup_tree_on_exit = True
         elif self.options.perf:
             self.log.warning(
                 "Not cleaning up dir {} due to perf data".format(
                     self.options.tmpdir))
             cleanup_tree_on_exit = False
         else:
             self.log.warning(
                 "Not cleaning up dir {}".format(self.options.tmpdir))
             cleanup_tree_on_exit = False
 
         if self.success == TestStatus.PASSED:
             self.log.info("Tests successful")
             exit_code = TEST_EXIT_PASSED
         elif self.success == TestStatus.SKIPPED:
             self.log.info("Test skipped")
             exit_code = TEST_EXIT_SKIPPED
         else:
             self.log.error(
                 "Test failed. Test logging available at {}/test_framework.log".format(self.options.tmpdir))
             self.log.error("")
             self.log.error("Hint: Call {} '{}' to consolidate all logs".format(os.path.normpath(
                 os.path.dirname(os.path.realpath(__file__)) + "/../combine_logs.py"), self.options.tmpdir))
             self.log.error("")
             self.log.error(
                 "If this failure happened unexpectedly or intermittently, please"
                 " file a bug and provide a link or upload of the combined log.")
             self.log.error(self.config['environment']['PACKAGE_BUGREPORT'])
             self.log.error("")
             exit_code = TEST_EXIT_FAILED
         # Logging.shutdown will not remove stream- and filehandlers, so we must
         # do it explicitly. Handlers are removed so the next test run can apply
         # different log handler settings.
         # See: https://docs.python.org/3/library/logging.html#logging.shutdown
         for h in list(self.log.handlers):
             h.flush()
             h.close()
             self.log.removeHandler(h)
         rpc_logger = logging.getLogger("BitcoinRPC")
         for h in list(rpc_logger.handlers):
             h.flush()
             rpc_logger.removeHandler(h)
         if cleanup_tree_on_exit:
             shutil.rmtree(self.options.tmpdir)
 
         self.nodes.clear()
         return exit_code
 
     # Methods to override in subclass test scripts.
     def set_test_params(self):
         """Tests must this method to change default values for number of nodes, topology, etc"""
         raise NotImplementedError
 
     def add_options(self, parser):
         """Override this method to add command-line options to the test"""
         pass
 
     def skip_test_if_missing_module(self):
         """Override this method to skip a test if a module is not compiled"""
         pass
 
     def setup_chain(self):
         """Override this method to customize blockchain setup"""
         self.log.info("Initializing test directory " + self.options.tmpdir)
         if self.setup_clean_chain:
             self._initialize_chain_clean()
         else:
             self._initialize_chain()
 
     def setup_network(self):
         """Override this method to customize test network topology"""
         self.setup_nodes()
 
         # Connect the nodes as a "chain".  This allows us
         # to split the network between nodes 1 and 2 to get
         # two halves that can work on competing chains.
         #
         # Topology looks like this:
         # node0 <-- node1 <-- node2 <-- node3
         #
         # If all nodes are in IBD (clean chain from genesis), node0 is assumed to be the source of blocks (miner). To
         # ensure block propagation, all nodes will establish outgoing connections toward node0.
         # See fPreferredDownload in net_processing.
         #
         # If further outbound connections are needed, they can be added at the beginning of the test with e.g.
         # self.connect_nodes(1, 2)
         for i in range(self.num_nodes - 1):
             self.connect_nodes(i + 1, i)
         self.sync_all()
 
     def setup_nodes(self):
         """Override this method to customize test node setup"""
         extra_args = None
         if hasattr(self, "extra_args"):
             extra_args = self.extra_args
         self.add_nodes(self.num_nodes, extra_args)
         self.start_nodes()
         self.import_deterministic_coinbase_privkeys()
         if not self.setup_clean_chain:
             for n in self.nodes:
                 assert_equal(n.getblockchaininfo()["blocks"], 199)
             # To ensure that all nodes are out of IBD, the most recent block
             # must have a timestamp not too old (see IsInitialBlockDownload()).
             self.log.debug('Generate a block with current time')
             block_hash = self.nodes[0].generate(1)[0]
             block = self.nodes[0].getblock(blockhash=block_hash, verbosity=0)
             for n in self.nodes:
                 n.submitblock(block)
                 chain_info = n.getblockchaininfo()
                 assert_equal(chain_info["blocks"], 200)
                 assert_equal(chain_info["initialblockdownload"], False)
 
     def import_deterministic_coinbase_privkeys(self):
         for n in self.nodes:
             try:
                 n.getwalletinfo()
             except JSONRPCException as e:
                 assert str(e).startswith('Method not found')
                 continue
 
             n.importprivkey(
                 privkey=n.get_deterministic_priv_key().key,
                 label='coinbase')
 
     def run_test(self):
         """Tests must override this method to define test logic"""
         raise NotImplementedError
 
     # Public helper methods. These can be accessed by the subclass test
     # scripts.
 
     def add_nodes(self, num_nodes: int, extra_args=None,
                   *, host=None, binary=None):
         """Instantiate TestNode objects.
 
         Should only be called once after the nodes have been specified in
         set_test_params()."""
         if self.bind_to_localhost_only:
             extra_confs = [["bind=127.0.0.1"]] * num_nodes
         else:
             extra_confs = [[]] * num_nodes
         if extra_args is None:
             extra_args = [[]] * num_nodes
         if binary is None:
             binary = [self.options.bitcoind] * num_nodes
         assert_equal(len(extra_confs), num_nodes)
         assert_equal(len(extra_args), num_nodes)
         assert_equal(len(binary), num_nodes)
         for i in range(num_nodes):
             self.nodes.append(TestNode(
                 i,
                 get_datadir_path(self.options.tmpdir, i),
                 chain=self.chain,
                 host=host,
                 rpc_port=rpc_port(i),
                 p2p_port=p2p_port(i),
                 timewait=self.rpc_timeout,
                 timeout_factor=self.options.timeout_factor,
                 bitcoind=binary[i],
                 bitcoin_cli=self.options.bitcoincli,
                 coverage_dir=self.options.coveragedir,
                 cwd=self.options.tmpdir,
                 extra_conf=extra_confs[i],
                 extra_args=extra_args[i],
                 use_cli=self.options.usecli,
                 emulator=self.options.emulator,
                 start_perf=self.options.perf,
                 use_valgrind=self.options.valgrind,
             ))
             if self.options.axionactivation:
                 self.nodes[i].extend_default_args(
                     ["-axionactivationtime={}".format(TIMESTAMP_IN_THE_PAST)])
 
     def start_node(self, i, *args, **kwargs):
         """Start a bitcoind"""
 
         node = self.nodes[i]
 
         node.start(*args, **kwargs)
         node.wait_for_rpc_connection()
 
         if self.options.coveragedir is not None:
             coverage.write_all_rpc_commands(self.options.coveragedir, node.rpc)
 
     def start_nodes(self, extra_args=None, *args, **kwargs):
         """Start multiple bitcoinds"""
 
         if extra_args is None:
             extra_args = [None] * self.num_nodes
         assert_equal(len(extra_args), self.num_nodes)
         try:
             for i, node in enumerate(self.nodes):
                 node.start(extra_args[i], *args, **kwargs)
             for node in self.nodes:
                 node.wait_for_rpc_connection()
         except BaseException:
             # If one node failed to start, stop the others
             self.stop_nodes()
             raise
 
         if self.options.coveragedir is not None:
             for node in self.nodes:
                 coverage.write_all_rpc_commands(
                     self.options.coveragedir, node.rpc)
 
     def stop_node(self, i, expected_stderr='', wait=0):
         """Stop a bitcoind test node"""
         self.nodes[i].stop_node(expected_stderr, wait=wait)
 
     def stop_nodes(self, wait=0):
         """Stop multiple bitcoind test nodes"""
         for node in self.nodes:
             # Issue RPC to stop nodes
             node.stop_node(wait=wait, wait_until_stopped=False)
 
         for node in self.nodes:
             # Wait for nodes to stop
             node.wait_until_stopped()
 
     def restart_node(self, i, extra_args=None):
         """Stop and start a test node"""
         self.stop_node(i)
         self.start_node(i, extra_args)
 
     def wait_for_node_exit(self, i, timeout):
         self.nodes[i].process.wait(timeout)
 
     def connect_nodes(self, a, b):
         connect_nodes(self.nodes[a], self.nodes[b])
 
     def disconnect_nodes(self, a, b):
         disconnect_nodes(self.nodes[a], self.nodes[b])
 
     def split_network(self):
         """
         Split the network of four nodes into nodes 0/1 and 2/3.
         """
         self.disconnect_nodes(1, 2)
         self.sync_all(self.nodes[:2])
         self.sync_all(self.nodes[2:])
 
     def join_network(self):
         """
         Join the (previously split) network halves together.
         """
         self.connect_nodes(1, 2)
         self.sync_all()
 
     def sync_blocks(self, nodes=None, wait=1, timeout=60):
         """
         Wait until everybody has the same tip.
         sync_blocks needs to be called with an rpc_connections set that has least
         one node already synced to the latest, stable tip, otherwise there's a
         chance it might return before all nodes are stably synced.
         """
         rpc_connections = nodes or self.nodes
         timeout = int(timeout * self.options.timeout_factor)
         stop_time = time.time() + timeout
         while time.time() <= stop_time:
             best_hash = [x.getbestblockhash() for x in rpc_connections]
             if best_hash.count(best_hash[0]) == len(rpc_connections):
                 return
             # Check that each peer has at least one connection
             assert (all([len(x.getpeerinfo()) for x in rpc_connections]))
             time.sleep(wait)
         raise AssertionError("Block sync timed out after {}s:{}".format(
             timeout,
             "".join("\n  {!r}".format(b) for b in best_hash),
         ))
 
     def sync_mempools(self, nodes=None, wait=1, timeout=60,
                       flush_scheduler=True):
         """
         Wait until everybody has the same transactions in their memory
         pools
         """
         rpc_connections = nodes or self.nodes
         timeout = int(timeout * self.options.timeout_factor)
         stop_time = time.time() + timeout
         while time.time() <= stop_time:
             pool = [set(r.getrawmempool()) for r in rpc_connections]
             if pool.count(pool[0]) == len(rpc_connections):
                 if flush_scheduler:
                     for r in rpc_connections:
                         r.syncwithvalidationinterfacequeue()
                 return
             # Check that each peer has at least one connection
             assert (all([len(x.getpeerinfo()) for x in rpc_connections]))
             time.sleep(wait)
         raise AssertionError("Mempool sync timed out after {}s:{}".format(
             timeout,
             "".join("\n  {!r}".format(m) for m in pool),
         ))
 
     def sync_proofs(self, nodes=None, wait=1, timeout=60):
         """
         Wait until everybody has the same proofs in their proof pools
         """
         rpc_connections = nodes or self.nodes
         timeout = int(timeout * self.options.timeout_factor)
         stop_time = time.time() + timeout
 
         def format_ids(id_list):
             """Convert ProodIDs to hex strings for easier debugging"""
             return list(f"{i:064x}" for i in id_list)
 
         while time.time() <= stop_time:
             nodes_proofs = [
                 set(format_ids(get_proof_ids(r))) for r in rpc_connections]
             if nodes_proofs.count(nodes_proofs[0]) == len(rpc_connections):
                 return
             # Check that each peer has at least one connection
             assert (all([len(x.getpeerinfo()) for x in rpc_connections]))
             time.sleep(wait)
         raise AssertionError("Proofs sync timed out after {}s:{}".format(
             timeout,
             "".join("\n  {!r}".format(m) for m in nodes_proofs),
         ))
 
     def sync_all(self, nodes=None):
         self.sync_blocks(nodes)
         self.sync_mempools(nodes)
 
-    def wait_until(self, test_function, timeout=60, lock=None):
-        return wait_until_helper(test_function, timeout=timeout, lock=lock,
+    def wait_until(self, test_function, timeout=60):
+        return wait_until_helper(test_function, timeout=timeout,
                                  timeout_factor=self.options.timeout_factor)
 
     # Private helper methods. These should not be accessed by the subclass
     # test scripts.
 
     def _start_logging(self):
         # Add logger and logging handlers
         self.log = logging.getLogger('TestFramework')
         self.log.setLevel(logging.DEBUG)
         # Create file handler to log all messages
         fh = logging.FileHandler(
             self.options.tmpdir + '/test_framework.log', encoding='utf-8')
         fh.setLevel(logging.DEBUG)
         # Create console handler to log messages to stderr. By default this
         # logs only error messages, but can be configured with --loglevel.
         ch = logging.StreamHandler(sys.stdout)
         # User can provide log level as a number or string (eg DEBUG). loglevel
         # was caught as a string, so try to convert it to an int
         ll = int(self.options.loglevel) if self.options.loglevel.isdigit(
         ) else self.options.loglevel.upper()
         ch.setLevel(ll)
         # Format logs the same as bitcoind's debug.log with microprecision (so
         # log files can be concatenated and sorted)
         formatter = logging.Formatter(
             fmt='%(asctime)s.%(msecs)03d000Z %(name)s (%(levelname)s): %(message)s', datefmt='%Y-%m-%dT%H:%M:%S')
         formatter.converter = time.gmtime
         fh.setFormatter(formatter)
         ch.setFormatter(formatter)
         # add the handlers to the logger
         self.log.addHandler(fh)
         self.log.addHandler(ch)
 
         if self.options.trace_rpc:
             rpc_logger = logging.getLogger("BitcoinRPC")
             rpc_logger.setLevel(logging.DEBUG)
             rpc_handler = logging.StreamHandler(sys.stdout)
             rpc_handler.setLevel(logging.DEBUG)
             rpc_logger.addHandler(rpc_handler)
 
     def _initialize_chain(self):
         """Initialize a pre-mined blockchain for use by the test.
 
         Create a cache of a 199-block-long chain
         Afterward, create num_nodes copies from the cache."""
 
         # Use node 0 to create the cache for all other nodes
         CACHE_NODE_ID = 0
         cache_node_dir = get_datadir_path(self.options.cachedir, CACHE_NODE_ID)
         assert self.num_nodes <= MAX_NODES
 
         if not os.path.isdir(cache_node_dir):
             self.log.debug(
                 "Creating cache directory {}".format(cache_node_dir))
 
             initialize_datadir(
                 self.options.cachedir,
                 CACHE_NODE_ID,
                 self.chain)
             self.nodes.append(
                 TestNode(
                     CACHE_NODE_ID,
                     cache_node_dir,
                     chain=self.chain,
                     extra_conf=["bind=127.0.0.1"],
                     extra_args=['-disablewallet'],
                     host=None,
                     rpc_port=rpc_port(CACHE_NODE_ID),
                     p2p_port=p2p_port(CACHE_NODE_ID),
                     timewait=self.rpc_timeout,
                     timeout_factor=self.options.timeout_factor,
                     bitcoind=self.options.bitcoind,
                     bitcoin_cli=self.options.bitcoincli,
                     coverage_dir=None,
                     cwd=self.options.tmpdir,
                     emulator=self.options.emulator,
                 ))
 
             if self.options.axionactivation:
                 self.nodes[CACHE_NODE_ID].extend_default_args(
                     ["-axionactivationtime={}".format(TIMESTAMP_IN_THE_PAST)])
 
             self.start_node(CACHE_NODE_ID)
             cache_node = self.nodes[CACHE_NODE_ID]
 
             # Wait for RPC connections to be ready
             cache_node.wait_for_rpc_connection()
 
             # Set a time in the past, so that blocks don't end up in the future
             cache_node.setmocktime(
                 cache_node.getblockheader(
                     cache_node.getbestblockhash())['time'])
 
             # Create a 199-block-long chain; each of the 4 first nodes
             # gets 25 mature blocks and 25 immature.
             # The 4th node gets only 24 immature blocks so that the very last
             # block in the cache does not age too much (have an old tip age).
             # This is needed so that we are out of IBD when the test starts,
             # see the tip age check in IsInitialBlockDownload().
             for i in range(8):
                 cache_node.generatetoaddress(
                     nblocks=25 if i != 7 else 24,
                     address=TestNode.PRIV_KEYS[i % 4].address,
                 )
 
             assert_equal(cache_node.getblockchaininfo()["blocks"], 199)
 
             # Shut it down, and clean up cache directories:
             self.stop_nodes()
             self.nodes = []
 
             def cache_path(*paths):
                 return os.path.join(cache_node_dir, self.chain, *paths)
 
             # Remove empty wallets dir
             os.rmdir(cache_path('wallets'))
             for entry in os.listdir(cache_path()):
                 # Only keep chainstate and blocks folder
                 if entry not in ['chainstate', 'blocks']:
                     os.remove(cache_path(entry))
 
         for i in range(self.num_nodes):
             self.log.debug(
                 "Copy cache directory {} to node {}".format(
                     cache_node_dir, i))
             to_dir = get_datadir_path(self.options.tmpdir, i)
             shutil.copytree(cache_node_dir, to_dir)
             # Overwrite port/rpcport in bitcoin.conf
             initialize_datadir(self.options.tmpdir, i, self.chain)
 
     def _initialize_chain_clean(self):
         """Initialize empty blockchain for use by the test.
 
         Create an empty blockchain and num_nodes wallets.
         Useful if a test case wants complete control over initialization."""
         for i in range(self.num_nodes):
             initialize_datadir(self.options.tmpdir, i, self.chain)
 
     def skip_if_no_py3_zmq(self):
         """Attempt to import the zmq package and skip the test if the import fails."""
         try:
             import zmq  # noqa
         except ImportError:
             raise SkipTest("python3-zmq module not available.")
 
     def skip_if_no_bitcoind_zmq(self):
         """Skip the running test if bitcoind has not been compiled with zmq support."""
         if not self.is_zmq_compiled():
             raise SkipTest("bitcoind has not been built with zmq enabled.")
 
     def skip_if_no_wallet(self):
         """Skip the running test if wallet has not been compiled."""
         if not self.is_wallet_compiled():
             raise SkipTest("wallet has not been compiled.")
 
     def skip_if_no_wallet_tool(self):
         """Skip the running test if bitcoin-wallet has not been compiled."""
         if not self.is_wallet_tool_compiled():
             raise SkipTest("bitcoin-wallet has not been compiled")
 
     def skip_if_no_cli(self):
         """Skip the running test if bitcoin-cli has not been compiled."""
         if not self.is_cli_compiled():
             raise SkipTest("bitcoin-cli has not been compiled.")
 
     def is_cli_compiled(self):
         """Checks whether bitcoin-cli was compiled."""
         return self.config["components"].getboolean("ENABLE_CLI")
 
     def is_wallet_compiled(self):
         """Checks whether the wallet module was compiled."""
         return self.config["components"].getboolean("ENABLE_WALLET")
 
     def is_wallet_tool_compiled(self):
         """Checks whether bitcoin-wallet was compiled."""
         return self.config["components"].getboolean("ENABLE_WALLET_TOOL")
 
     def is_zmq_compiled(self):
         """Checks whether the zmq module was compiled."""
         return self.config["components"].getboolean("ENABLE_ZMQ")