Page MenuHomePhabricator
Files F14864413

D2346.id6749.diff
No OneTemporary
Actions

D2346.id6749.diff
View Options

diff --git a/test/functional/abc-p2p-compactblocks.py b/test/functional/abc-p2p-compactblocks.py
--- a/test/functional/abc-p2p-compactblocks.py
+++ b/test/functional/abc-p2p-compactblocks.py
@@ -273,7 +273,7 @@
# Check that compact block also work for big blocks
node = self.nodes[0]
peer = TestNode()
- peer.add_connection(NodeConn('127.0.0.1', p2p_port(0), node, peer))
+ peer.add_connection(NodeConn('127.0.0.1', p2p_port(0), peer))
# Wait for connection to be etablished
peer.wait_for_verack()
diff --git a/test/functional/abc-sync-chain.py b/test/functional/abc-sync-chain.py
--- a/test/functional/abc-sync-chain.py
+++ b/test/functional/abc-sync-chain.py
@@ -45,7 +45,7 @@
def run_test(self):
node0conn = BaseNode()
node0conn.add_connection(
- NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], node0conn))
+ NodeConn('127.0.0.1', p2p_port(0), node0conn))
NetworkThread().start()
node0conn.wait_for_verack()
diff --git a/test/functional/test_framework/comptool.py b/test/functional/test_framework/comptool.py
--- a/test/functional/test_framework/comptool.py
+++ b/test/functional/test_framework/comptool.py
@@ -191,7 +191,7 @@
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))
+ 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
--- a/test/functional/test_framework/mininode.py
+++ b/test/functional/test_framework/mininode.py
@@ -1319,7 +1319,6 @@
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):
@@ -1425,7 +1424,7 @@
"regtest": b"\xda\xb5\xbf\xfa",
}
- def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK, send_version=True):
+ def __init__(self, dstaddr, dstport, callback, net="regtest", services=NODE_NETWORK, send_version=True):
asyncore.dispatcher.__init__(self, map=mininode_socket_map)
self.dstaddr = dstaddr
self.dstport = dstport
@@ -1433,8 +1432,6 @@
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
@@ -1459,7 +1456,6 @@
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
--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -198,7 +198,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Tue, May 20, 19:29 (3 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5865788
Default Alt Text
D2346.id6749.diff (3 KB)

Event Timeline