Browse Source

qa: mininode learns when a socket connects, not its first action

tags/v0.15.1
Matt Corallo 4 years ago
parent
commit
8aaba7a6b7
1 changed files with 24 additions and 12 deletions
  1. 24
    12
      qa/rpc-tests/test_framework/mininode.py

+ 24
- 12
qa/rpc-tests/test_framework/mininode.py View File

@@ -1614,7 +1614,7 @@ class NodeConn(asyncore.dispatcher):
"regtest": b"\xfa\xbf\xb5\xda", # regtest
}

def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK):
def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK, send_version=True):
asyncore.dispatcher.__init__(self, map=mininode_socket_map)
self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport))
self.dstaddr = dstaddr
@@ -1631,14 +1631,16 @@ class NodeConn(asyncore.dispatcher):
self.disconnect = False
self.nServices = 0

# stuff version msg into sendbuf
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
self.send_message(vt, True)
if send_version:
# stuff version msg into sendbuf
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
self.send_message(vt, True)

print('MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \
+ str(dstport))

@@ -1652,8 +1654,9 @@ class NodeConn(asyncore.dispatcher):
self.log.debug(msg)

def handle_connect(self):
self.show_debug_msg("MiniNode: Connected & Listening: \n")
self.state = "connected"
if self.state != "connected":
self.show_debug_msg("MiniNode: Connected & Listening: \n")
self.state = "connected"

def handle_close(self):
self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "
@@ -1681,11 +1684,20 @@ class NodeConn(asyncore.dispatcher):

def writable(self):
with mininode_lock:
pre_connection = self.state == "connecting"
length = len(self.sendbuf)
return (length > 0)
return (length > 0 or pre_connection)

def handle_write(self):
with mininode_lock:
# asyncore does not expose socket connection, only the first read/write
# event, thus we must check connection manually here to know when we
# actually connect
if self.state == "connecting":
self.handle_connect()
if not self.writable():
return

try:
sent = self.send(self.sendbuf)
except:

Loading…
Cancel
Save