Cleanup storage code now that message queue is implemented.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@698 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/storage/app.py

@@ -222,6 +222,7 @@ class Application(object):
                             node = nm.getNodeByUUID(uuid)
                             if node is self.primary_master_node:
                                 # Yes, I have.
+                                conn.setHandler(VerificationEventHandler(self))
                                 return
 
     def verifyData(self):

neo/storage/bootstrap.py

@@ -181,10 +181,6 @@ class BootstrapEventHandler(StorageEventHandler):
         # Node UUID was set in handleAnswerPrimaryMaster
         assert node.getUUID() == uuid
 
-        # XXX: change handler for next packet (which might be handled in poll before it returns)
-        # This should be removed when we will handle our own pending packet queue.
-        conn.setHandler(VerificationEventHandler(app))
-
     @decorators.client_connection_required
     def handleAnswerPrimaryMaster(self, conn, packet, primary_uuid,
                                   known_master_list):