From f4dcf0206295d1b8db4fdb4aafd9e9693e9d2d88 Mon Sep 17 00:00:00 2001 From: mdr0id Date: Wed, 4 Dec 2019 07:55:49 -0800 Subject: [PATCH] update to py3 env path --- qa/rpc-tests/test_framework/comptool.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py index 40d7119c3..00f45b5b5 100755 --- a/qa/rpc-tests/test_framework/comptool.py +++ b/qa/rpc-tests/test_framework/comptool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # # Distributed under the MIT software license, see the accompanying # file COPYING or https://www.opensource.org/licenses/mit-license.php . @@ -95,6 +95,12 @@ class TestNode(NodeConnCB): del self.pingMap[message.nonce] except KeyError: raise AssertionError("Got pong for unknown ping [%s]" % repr(message)) + + def on_reject(self, conn, message): + if message.message == b'tx': + self.tx_reject_map[message.data] = RejectResult(message.code, message.reason) + if message.message == b'block': + self.block_reject_map[message.data] = RejectResult(message.code, message.reason) def send_inv(self, obj): mtype = 2 if isinstance(obj, CBlock) else 1 @@ -174,7 +180,7 @@ class TestManager(): def wait_for_verack(self): def veracked(): return all(node.verack_received for node in self.test_nodes) - #return wait_until(veracked, timeout=10) + return wait_until(veracked, timeout=10) def wait_for_pings(self, counter): def received_pongs():