Added more tests for edge cases.

[electrum-nvc.git] / lib / interface.py

diff --git a/lib/interface.py b/lib/interface.py
index 6c8c730..0b1cba4 100644 (file)
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -105,7 +105,6 @@ class Interface(threading.Thread):
         #json
         self.message_id = 0
         self.unanswered_requests = {}
-        self.pending_transactions_for_notifications= []
 
         # parse server
         self.server = server
@@ -244,11 +243,13 @@ class Interface(threading.Thread):
         t1 = time.time()
 
         data = []
+        ids = []
         for m in messages:
             method, params = m
             if type(params) != type([]): params = [params]
             data.append( { 'method':method, 'id':self.message_id, 'params':params } )
             self.unanswered_requests[self.message_id] = method, params, callback
+            ids.append(self.message_id)
             self.message_id += 1
 
         if data:
@@ -291,6 +292,7 @@ class Interface(threading.Thread):
 
         self.rtime = time.time() - t1
         self.is_connected = True
+        return ids
 
 
 
@@ -315,7 +317,13 @@ class Interface(threading.Thread):
                 is_new = True
                 # get server certificate.
                 # Do not use ssl.get_server_certificate because it does not work with proxy
-                for res in socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM):
+                try:
+                    l = socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM)
+                except socket.gaierror:
+                    print_error("error: cannot resolve", self.host)
+                    return
+
+                for res in l:
                     try:
                         s = socket.socket( res[0], socket.SOCK_STREAM )
                         s.connect(res[4])
@@ -346,7 +354,13 @@ class Interface(threading.Thread):
             else:
                 is_new = False
 
-        for res in socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM):
+        try:
+            addrinfo = socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM)
+        except socket.gaierror:
+            print_error("error: cannot resolve", self.host)
+            return
+
+        for res in addrinfo:
             try:
                 s = socket.socket( res[0], socket.SOCK_STREAM )
                 s.settimeout(2)
@@ -382,7 +396,7 @@ class Interface(threading.Thread):
                         print_error("certificate has expired:", cert_path)
                         os.unlink(cert_path)
                     else:
-                        print_msg("wrong certificate", self.host)
+                        print_error("wrong certificate", self.host)
                 return
             except Exception:
                 print_error("wrap_socket failed", self.host)
@@ -412,7 +426,9 @@ class Interface(threading.Thread):
                 except ssl.SSLError:
                     timeout = True
                 except socket.error, err:
-                    if err.errno in [11, 10035]:
+                    if err.errno == 60:
+                        timeout = True
+                    elif err.errno in [11, 10035]:
                         print_error("socket errno", err.errno)
                         time.sleep(0.1)
                         continue
@@ -550,6 +566,8 @@ class Interface(threading.Thread):
             self.s.shutdown(socket.SHUT_RDWR)
             self.s.close()
 
+        self.is_connected = False
+
 
     def is_up_to_date(self):
         return self.unanswered_requests == {}
@@ -579,6 +597,22 @@ class Interface(threading.Thread):
         self.queue.put(self)
 
 
+    def synchronous_get(self, requests, timeout=100000000):
+        queue = Queue.Queue()
+        ids = self.send(requests, lambda i,r: queue.put(r))
+        id2 = ids[:]
+        res = {}
+        while ids:
+            r = queue.get(True, timeout)
+            _id = r.get('id')
+            if _id in ids:
+                ids.remove(_id)
+                res[_id] = r.get('result')
+        out = []
+        for _id in id2:
+            out.append(res[_id])
+        return out
+
 
 if __name__ == "__main__":