diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-11-13 17:28:41 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-11-13 17:43:39 -0500 |
commit | fafdad0d461330aee7a17db57a9d8f25906203cc (patch) | |
tree | d55171e131d45c0740c22e3f864aba0c26051bd7 /test/functional/test_framework | |
parent | 5e468994fbb349e8eefc996954a31a67a34aaa15 (diff) | |
download | bitcoin-fafdad0d461330aee7a17db57a9d8f25906203cc.tar.xz |
qa: Remove unused NodeConn members
Diffstat (limited to 'test/functional/test_framework')
-rwxr-xr-x | test/functional/test_framework/comptool.py | 2 | ||||
-rwxr-xr-x | test/functional/test_framework/mininode.py | 6 | ||||
-rwxr-xr-x | test/functional/test_framework/test_node.py | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/test/functional/test_framework/comptool.py b/test/functional/test_framework/comptool.py index 03f967ba71..723826bae4 100755 --- a/test/functional/test_framework/comptool.py +++ b/test/functional/test_framework/comptool.py @@ -177,7 +177,7 @@ class TestManager(): # Create a p2p connection to each node test_node = TestNode(self.block_store, self.tx_store) self.test_nodes.append(test_node) - self.connections.append(NodeConn('127.0.0.1', p2p_port(i), nodes[i], test_node)) + self.connections.append(NodeConn('127.0.0.1', p2p_port(i), test_node)) # Make sure the TestNode (callback class) has a reference to its # associated NodeConn test_node.add_connection(self.connections[-1]) diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 8fbc63fba4..24ee09b81c 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -1420,7 +1420,6 @@ class NodeConnCB(): conn.send_message(msg_pong(message.nonce)) def on_verack(self, conn, message): - conn.ver_recv = conn.ver_send self.verack_received = True def on_version(self, conn, message): @@ -1516,7 +1515,7 @@ class NodeConn(asyncore.dispatcher): "regtest": b"\xfa\xbf\xb5\xda", # regtest } - def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK|NODE_WITNESS, send_version=True): + def __init__(self, dstaddr, dstport, callback, net="regtest", services=NODE_NETWORK|NODE_WITNESS, send_version=True): asyncore.dispatcher.__init__(self, map=mininode_socket_map) self.dstaddr = dstaddr self.dstport = dstport @@ -1524,8 +1523,6 @@ class NodeConn(asyncore.dispatcher): self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) self.sendbuf = b"" self.recvbuf = b"" - self.ver_send = 209 - self.ver_recv = 209 self.last_sent = 0 self.state = "connecting" self.network = net @@ -1549,7 +1546,6 @@ class NodeConn(asyncore.dispatcher): self.connect((dstaddr, dstport)) except: self.handle_close() - self.rpc = rpc def handle_connect(self): if self.state != "connected": diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 8b28064c46..9c6ea9a83b 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -168,7 +168,7 @@ class TestNode(): if 'dstaddr' not in kwargs: kwargs['dstaddr'] = '127.0.0.1' self.p2ps.append(p2p_conn) - kwargs.update({'rpc': self.rpc, 'callback': p2p_conn}) + kwargs.update({'callback': p2p_conn}) p2p_conn.add_connection(NodeConn(**kwargs)) return p2p_conn |