diff options
author | James O'Beirne <james.obeirne@gmail.com> | 2018-10-19 13:34:28 -0400 |
---|---|---|
committer | James O'Beirne <james.obeirne@gmail.com> | 2018-11-01 14:52:49 -0400 |
commit | 62f94d39f8de88a44bb0a8a2837d864f777aaacc (patch) | |
tree | d88b9c6e313e17b161a3ca1274cf8ea8c60f7d3b /test/functional/test_framework | |
parent | 5aa31f6ef26f51ce461c917654dd1cfbbdd1409a (diff) | |
download | bitcoin-62f94d39f8de88a44bb0a8a2837d864f777aaacc.tar.xz |
tests: add P2PConnection.send_raw_message
Diffstat (limited to 'test/functional/test_framework')
-rwxr-xr-x | test/functional/test_framework/mininode.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 6864e8a838..4d78f4adf3 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -175,10 +175,13 @@ class P2PConnection(asyncio.Protocol): This method takes a P2P payload, builds the P2P header and adds the message to the send buffer to be sent over the socket.""" + tmsg = self.build_message(message) + self._log_message("send", message) + return self.send_raw_message(tmsg) + + def send_raw_message(self, raw_message_bytes): if not self.is_connected: raise IOError('Not connected') - self._log_message("send", message) - tmsg = self._build_message(message) def maybe_write(): if not self._transport: @@ -188,12 +191,12 @@ class P2PConnection(asyncio.Protocol): # Python 3.4 versions. if hasattr(self._transport, 'is_closing') and self._transport.is_closing(): return - self._transport.write(tmsg) + self._transport.write(raw_message_bytes) NetworkThread.network_event_loop.call_soon_threadsafe(maybe_write) # Class utility methods - def _build_message(self, message): + def build_message(self, message): """Build a serialized P2P message""" command = message.command data = message.serialize() @@ -376,9 +379,9 @@ class P2PInterface(P2PConnection): # Message sending helper functions - def send_and_ping(self, message): + def send_and_ping(self, message, timeout=60): self.send_message(message) - self.sync_with_ping() + self.sync_with_ping(timeout=timeout) # Sync up with the node def sync_with_ping(self, timeout=60): |