Make NodeManager.remove stricter

neo/lib/node.py

@@ -280,9 +280,6 @@ class NodeManager(EventQueue):
             self._master_db.add(node.getAddress())
 
     def remove(self, node):
-        if node not in self._node_set:
-            logging.warning('removing unknown node %r, ignoring', node)
-            return
         self._node_set.remove(node)
         # a node may have not be indexed by uuid or address, eg.:
         # - a client or admin node that don't have listening address

neo/master/handlers/administration.py

@@ -43,7 +43,8 @@ class AdministrationHandler(MasterHandler):
 
     def connectionLost(self, conn, new_state):
         node = self.app.nm.getByUUID(conn.getUUID())
-        self.app.nm.remove(node)
+        if node is not None:
+            self.app.nm.remove(node)
 
     def setClusterState(self, conn, state):
         app = self.app

neo/master/handlers/client.py

@@ -30,7 +30,6 @@ class ClientServiceHandler(MasterHandler):
         app.tm.clientLost(node)
         node.setUnknown()
         app.broadcastNodesInformation([node])
-        app.nm.remove(node)
 
     def askBeginTransaction(self, conn, tid):
         """