Improve python3 compatibility of network module

- some network tests now run with python3, rest use mock network

Author: PeterSurda

src/mockbm/network.py

@@ -14,11 +14,28 @@ class objectracker(object):
 class stats(object):
     """Mock network statistics"""
 
+    pool = None
+
+    @staticmethod
+    def init(pool_instance):
+        """Mock init with pool reference"""
+        stats.pool = pool_instance
+
     @staticmethod
     def connectedHostsList():
         """Mock list of all the connected hosts"""
         return ["conn1", "conn2", "conn3", "conn4"]
 
+    @staticmethod
+    def sentBytes():
+        """Mock sent bytes"""
+        return 1
+
+    @staticmethod
+    def receivedBytes():
+        """Mock received bytes"""
+        return 1
+
     @staticmethod
     def pendingDownload():
         """Mock pending download count"""

src/network/advanceddispatcher.py

@@ -28,7 +28,7 @@ class AdvancedDispatcher(asyncore.dispatcher):
     _buf_len = 131072  # 128kB
 
     def __init__(self, sock=None):
-        if not hasattr(self, '_map'):
+        if '_map' not in self.__dict__:
             asyncore.dispatcher.__init__(self, sock)
         self.connectedAt = 0
         self.close_reason = None

src/network/bmproto.py

@@ -84,7 +84,7 @@ def state_bm_header(self):
         """Process incoming header"""
         self.magic, self.command, self.payloadLength, self.checksum = \
             protocol.Header.unpack(self.read_buf[:protocol.Header.size])
-        self.command = self.command.rstrip('\x00')
+        self.command = self.command.rstrip(b'\x00').decode('ascii', 'replace')
         if self.magic != protocol.magic:
             # skip 1 byte in order to sync
             self.set_state("bm_header", length=1)
@@ -170,17 +170,17 @@ def decode_payload_node(self):
         """Decode node details from the payload"""
         # protocol.checkIPAddress()
         services, host, port = self.decode_payload_content("Q16sH")
-        if host[0:12] == '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF':
-            host = socket.inet_ntop(socket.AF_INET, str(host[12:16]))
-        elif host[0:6] == '\xfd\x87\xd8\x7e\xeb\x43':
+        if host[0:12] == b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF':
+            host = socket.inet_ntop(socket.AF_INET, bytes(host[12:16]))
+        elif host[0:6] == b'\xfd\x87\xd8\x7e\xeb\x43':
             # Onion, based on BMD/bitcoind
-            host = base64.b32encode(host[6:]).lower() + ".onion"
+            host = base64.b32encode(bytes(host[6:])).decode('ascii').lower() + ".onion"
         else:
-            host = socket.inet_ntop(socket.AF_INET6, str(host))
+            host = socket.inet_ntop(socket.AF_INET6, bytes(host))
         if host == "":
             # This can happen on Windows systems which are not 64-bit
             # compatible so let us drop the IPv6 address.
-            host = socket.inet_ntop(socket.AF_INET, str(host[12:16]))
+            host = socket.inet_ntop(socket.AF_INET, bytes(host[12:16]))
 
         return Node(services, host, port)
 
@@ -445,11 +445,11 @@ def bm_command_addr(self):
         """Incoming addresses, process them"""
         # not using services
         for seenTime, stream, _, ip, port in self._decode_addr():
-            ip = str(ip)
+            ip = bytes(ip)
             if (
                 stream not in self.pool.streams
                 # FIXME: should check against complete list
-                or ip.startswith('bootstrap')
+                or ip.startswith(b'bootstrap')
             ):
                 continue
             decodedIP = protocol.checkIPAddress(ip)

src/network/connectionchooser.py

@@ -20,7 +20,7 @@
 def getDiscoveredPeer():
     """Get a peer from the local peer discovery list"""
     try:
-        peer = random.choice(state.discoveredPeers.keys())  # nosec B311
+        peer = random.choice(list(state.discoveredPeers.keys()))  # nosec B311
     except (IndexError, KeyError):
         raise ValueError
     try:
@@ -48,7 +48,7 @@ def chooseConnection(stream):
         return getDiscoveredPeer()
     for _ in range(50):
         peer = random.choice(  # nosec B311
-            knownnodes.knownNodes[stream].keys())
+            list(knownnodes.knownNodes[stream].keys()))
         try:
             peer_info = knownnodes.knownNodes[stream][peer]
             if peer_info.get('self'):

src/network/httpd.py

@@ -31,7 +31,7 @@ class HTTPRequestHandler(asyncore.dispatcher):
     </html>"""
 
     def __init__(self, sock):
-        if not hasattr(self, '_map'):
+        if '_map' not in self.__dict__:
             asyncore.dispatcher.__init__(self, sock)
         self.inbuf = ""
         self.ready = True
@@ -70,7 +70,7 @@ def handle_write(self):
 class HTTPSRequestHandler(HTTPRequestHandler, TLSHandshake):
     """Handling HTTPS request"""
     def __init__(self, sock):
-        if not hasattr(self, '_map'):
+        if '_map' not in self.__dict__:
             asyncore.dispatcher.__init__(self, sock)        # pylint: disable=non-parent-init-called
         # self.tlsDone = False
         TLSHandshake.__init__(
@@ -118,7 +118,7 @@ class HTTPServer(asyncore.dispatcher):
     port = 12345
 
     def __init__(self):
-        if not hasattr(self, '_map'):
+        if '_map' not in self.__dict__:
             asyncore.dispatcher.__init__(self)
         self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
         self.set_reuse_addr()
@@ -142,7 +142,7 @@ class HTTPSServer(HTTPServer):
     port = 12345
 
     def __init__(self):
-        if not hasattr(self, '_map'):
+        if '_map' not in self.__dict__:
             HTTPServer.__init__(self)
 
     def handle_accept(self):

src/network/https.py

@@ -17,7 +17,7 @@
 
 class HTTPSClient(HTTPClient, TLSHandshake):
     def __init__(self, host, path):
-        if not hasattr(self, '_map'):
+        if '_map' not in self.__dict__:
             asyncore.dispatcher.__init__(self)
         self.tlsDone = False
         """

src/network/knownnodes.py

@@ -97,7 +97,7 @@ def saveKnownNodes(dirName=None):
     if dirName is None:
         dirName = state.appdata
     with knownNodesLock:
-        with open(os.path.join(dirName, 'knownnodes.dat'), 'wb') as output:
+        with open(os.path.join(dirName, 'knownnodes.dat'), 'w') as output:
             json_serialize_knownnodes(output)
 
 

src/network/tcp.py

@@ -390,7 +390,7 @@ class TCPServer(AdvancedDispatcher):
     """TCP connection server for Bitmessage protocol"""
 
     def __init__(self, host='127.0.0.1', port=8444):
-        if not hasattr(self, '_map'):
+        if '_map' not in self.__dict__:
             AdvancedDispatcher.__init__(self)
         self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
         self.set_reuse_addr()

src/network/tls.py

@@ -34,7 +34,7 @@
 # ciphers
 if (
     ssl.OPENSSL_VERSION_NUMBER >= 0x10100000
-    and not ssl.OPENSSL_VERSION.startswith(b"LibreSSL")
+    and not ssl.OPENSSL_VERSION.startswith("LibreSSL")
 ):
     sslProtocolCiphers = "AECDH-AES256-SHA@SECLEVEL=0"
 else:

src/network/udp.py

@@ -80,7 +80,7 @@ def bm_command_addr(self):
             return True
         remoteport = False
         for seenTime, stream, _, ip, port in addresses:
-            decodedIP = protocol.checkIPAddress(str(ip))
+            decodedIP = protocol.checkIPAddress(bytes(ip))
             if stream not in self.pool.streams:
                 continue
             if (seenTime < time.time() - protocol.MAX_TIME_OFFSET