Changeset 215

Timestamp:

03/16/08 21:29:30 (4 years ago)

Author:

ocmathew

Message:

Change handshake options from a dict to key/value lists in a list.

Location:

trunk/pyopencoin/oc

Files:

• entities.py (modified) (2 diffs)
• protocols.py (modified) (6 diffs)
• tests.py (modified) (5 diffs)

trunk/pyopencoin/oc/entities.py

@@ -284 +284 @@
         >>> stt = transports.SimpleTestTransport()
         >>> w.listen(stt)
-        >>> stt.send('HANDSHAKE',{'protocol': 'opencoin 1.0'})
+        >>> stt.send('HANDSHAKE',[['protocol', 'opencoin 1.0']])
         <Message('HANDSHAKE_ACCEPT',None)>
         >>> stt.send('sendMoney',[1,2])
@@ -558 +558 @@
         >>> stt = transports.SimpleTestTransport()
         >>> i.listen(stt)
-        >>> stt.send('HANDSHAKE',{'protocol': 'opencoin 1.0'})
+        >>> stt.send('HANDSHAKE',[['protocol', 'opencoin 1.0']])
         <Message('HANDSHAKE_ACCEPT',None)>
         >>> stt.send('TRANSFER_TOKEN_REQUEST',[tid, 'my account', [], [tests.coinA.toPython()], [['type', 'redeem']]])

trunk/pyopencoin/oc/protocols.py

@@ -72 +72 @@
     def initiateHandshake(self,message):   
         self.newState(self.verifyHandshake)
-        return Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})
+        return Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])
 
     def verifyHandshake(self, message):
         if message.type == 'HANDSHAKE_ACCEPT':
             self.newState(self.firstStep)
+            # FIXME: If we have handshakes that return things, we need to check for them here
             return self.firstStep(message)
 
@@ -101 +102 @@
     def start(self,message):
         if message.type == 'HANDSHAKE':
-            if message.data['protocol'] == 'opencoin 1.0':
+            
+            # NOTE: We do not do set up the newState. If this fails, it comes right back to handshakes
+            if not isinstance(message.data, types.ListType):
+                return ProtocolErrorMessage('aHP')
+            
+            for var in message.data:
+                try:
+                    key, value = var
+                except ValueError:
+                    return ProtocolErrorMessage('aHP')
+            
+            if not message.data:
+                return ProtocolErrorMessage('aHP')
+
+            # Make a dictionary of options in the handshake
+
+            options = {}
+            for var in message.data:
+                key, value = var
+                if key in options:
+                    raise ProtocolErrorMessage('aHP')
+                
+                options[key] = value
+
+            # FIXME: If we allow opencoin 1.0+, we need to check for that as well
+            if options['protocol'] == 'opencoin 1.0':
                 # Set up a state where the handshake no longer is needed.
                 self.old_start = self.start
@@ -140 +166 @@
     >>> css = TokenSpendSender([coin1,coin2],'foobar')
     >>> css.state(Message(None))
-    <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+    <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
     >>> css.state(Message('HANDSHAKE_ACCEPT',None))
     <Message('SUM_ANNOUNCE',['...', '3', 'foobar'])>
@@ -378 +404 @@
     >>> tts = TransferTokenSender('my account',[],[coin1, coin2],type='redeem')
     >>> tts.state(Message(None))
-    <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+    <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
     >>> tts.state(Message('HANDSHAKE_ACCEPT',None))
     <Message('TRANSFER_TOKEN_REQUEST',['...', 'my account', [], [[(...)], [(...)]], [['type', 'redeem']]])>
@@ -874 +900 @@
     >>> fmp = fetchMintKeyProtocol(denominations=['1'])
     >>> fmp.state(Message(None))
-    <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+    <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
     >>> fmp.state(Message('HANDSHAKE_ACCEPT',None))
     <Message('MINT_KEY_FETCH_DENOMINATION',[['1'], '0'])>
@@ -892 +918 @@
     >>> fmp = fetchMintKeyProtocol(keyids=['sj17RxE1hfO06+oTgBs9Z7xLut/3NN+nHJbXSJYTks0='])
     >>> fmp.state(Message(None))
-    <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+    <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
     >>> fmp.state(Message('HANDSHAKE_ACCEPT'))
     <Message('MINT_KEY_FETCH_KEYID',['sj17RxE1hfO06+oTgBs9Z7xLut/3NN+nHJbXSJYTks0='])>

trunk/pyopencoin/oc/tests.py

@@ -19 +19 @@
 >>> t = ClientTest(issuer.listen)
 >>> walletA.fetchMintKey(t,denominations=['1'])
-Client <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+Client <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
 Server <Message('HANDSHAKE_ACCEPT',None)>
 Client <Message('MINT_KEY_FETCH_DENOMINATION',[['1'], '0'])>
@@ -32 +32 @@
 >>> t = ClientTest(issuer.listen)
 >>> walletA.fetchMintKey(t,denominations=['1'])
-Client <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+Client <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
 Server <Message('HANDSHAKE_ACCEPT',None)>
 Client <Message('MINT_KEY_FETCH_DENOMINATION',[['1'], '0'])>
@@ -46 +46 @@
 >>> walletB.coins = [coin1, coin2]
 >>> walletB.transferTokens(t,'myaccount',[],[coin1, coin2],type='redeem')
-Client <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+Client <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
 Server <Message('HANDSHAKE_ACCEPT',None)>
 Client <Message('TRANSFER_TOKEN_REQUEST',['...', 'myaccount', [], [[(...)], [(...)]], [['type', 'redeem']]])>
@@ -69 +69 @@
 
 >>> walletB.transferTokens(t, 'myaccount', blanks, walletB.coins, type='exchange')
-Client <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+Client <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
 Server <Message('HANDSHAKE_ACCEPT',None)>
 Client <Message('TRANSFER_TOKEN_REQUEST',['...', 'myaccount', [['...', ['...', '...', '...']]], [[(...)], [(...)]], [['type', 'exchange']]])>
@@ -86 +86 @@
 >>> walletA.coins=[coin1]
 >>> walletA.sendCoins(t, target='a book', amount=1)
-walletA <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+walletA <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
 walletB <Message('HANDSHAKE_ACCEPT',None)>
 walletA <Message('SUM_ANNOUNCE',['...', '...', '...', '1', 'a book'])>
 walletB <Message('SUM_ACCEPT',None)>
 walletA <Message('SPEND_TOKEN_REQUEST',['...', [[(...)]], 'a book'])>
-walletB <Message('HANDSHAKE',{'protocol': 'opencoin 1.0'})>
+walletB <Message('HANDSHAKE',[['protocol', 'opencoin 1.0']])>
 issuer <Message('HANDSHAKE_ACCEPT',None)>
 walletB <Message('TRANSFER_TOKEN_REQUEST',['...', 'my account', [], [[(...)]], [['type', 'redeem']]])>