Changeset 245

Timestamp:

04/04/08 04:24:15 (4 years ago)

Author:

ocmathew

Message:

Fix autoresetting protocols (Well, if after a PROTOCOL_ERROR it is okay to continue on a new track)

Location:

trunk/pyopencoin/oc

Files:

• entities.py (modified) (2 diffs)
• protocols.py (modified) (3 diffs)

trunk/pyopencoin/oc/entities.py

@@ -734 +734 @@
 
         >>> stt.send('FETCH_CDD_REQUEST', '0')
-        <Message('FETCH_CDD_PASS',[...]])>
+        <Message('FETCH_CDD_PASS',[...])>
 
         >>> stt.send('foo')
         <Message('PROTOCOL_ERROR','send again...')>
 
-        FIXME: There is a problem here. If we send anything other than a goodbye
-        next, we go into an infinite loop. I believe that the correct response is
-        another PROTOCOL_ERROR at this point
-        #>>> stt.send('FETCH_CDD_REQUEST', '0')
-        #<Message('FETCH_CDD_PASS',[...])>
+        >>> stt.send('FETCH_CDD_REQUEST', '0')
+        <Message('FETCH_CDD_PASS',[...])>
 
         >>> stt.send('GOODBYE')
@@ -750 +747 @@
         """
         if hasattr(transport, 'protocol') and transport.protocol:
+            # transport will only have protocol if we are looping on ourselves. Don't
+            # setup protocol again. Just reset the transport to use the protocol and
+            # reset the protocol itself
             transport.setProtocol(self.protocol)
+            self.protocol.newState(self.protocol.start) 
 
         else:

trunk/pyopencoin/oc/protocols.py

@@ -49 +49 @@
             message = Message('GOODBYE')
         #we are not done
-        if not self.done:                       
-            #maybe we need to reset?                
+        if not self.done:
+            #maybe we need to reset?
             if message.type != 'GOODBYE' and hasattr(self, 'transport') and hasattr(self.transport, 'autoreset'):
                 self.transport.autoreset(self.transport)
@@ -71 +71 @@
         self.state = method
         
-    def initiateHandshake(self,message):   
+    def initiateHandshake(self,message):
         self.newState(self.verifyHandshake)
         return Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])
@@ -176 +176 @@
             nextprotocol = self.mapping[message.type](self.arguments)
         except KeyError:
-            self.newState(self.goodbye)
-            return ProtocolErrorMessage('aHP')
-        except AttributeError:
             self.newState(self.goodbye)
             return ProtocolErrorMessage('aHP')