Changeset 273 for trunk

Timestamp:

04/23/09 15:33:57 (3 years ago)

Author:

ocjhb

Message:

using more messages

Location:

trunk/sandbox/jhb/oc2

Files:

• documentation.py (modified) (7 diffs)
• protocols.py (modified) (2 diffs)

trunk/sandbox/jhb/oc2/documentation.py

@@ -449 +449 @@
 >>> authorizer.deny = True
 >>> testserver.run_once(port,mint=mint,authorizer=authorizer)
->>> text,value =  clientside.run()
->>> text
+>>> clientside.run().header
 'TransferReject'
 
@@ -464 +463 @@
 >>> authorizer.deny = False
 >>> testserver.run_once(port,mint=mint,authorizer=authorizer)
->>> text,value =  clientside.run()
->>> text
+>>> response = clientside.run()
+>>> response.header
 'TransferAccept'
->>> blindsign = value[0]
+>>> blindsign = response.signatures[0]
 >>> blank.signature = key.unblind(secret,blindsign)
 >>> coin = blank
@@ -490 +489 @@
 >>> mint.delay = True
 >>> testserver.run_once(port,mint=mint,authorizer=authorizer)
->>> text,value =  clientside.run()
->>> text
+>>> clientside.run().header
 'TransferDelay'
 >>> mint.delay = False
@@ -531 +529 @@
 >>> clientside = protocols.TransferResume(transport,tid)
 >>> testserver.run_once(port,issuer=issuer)
->>> text,value =  clientside.run()
->>> text
+>>> clientside.run().header
 'TransferDelay'
 >>> issuer.delay = False
@@ -550 +547 @@
 >>> clientside = protocols.TransferResume(transport,tid)
 >>> testserver.run_once(port,issuer=issuer)
->>> text,value =  clientside.run()
->>> text
+>>> response = clientside.run()
+>>> response.header
 'TransferAccept'
 
@@ -566 +563 @@
 ###############################################################################
 
->>> blindsign = value[0]
+>>> blindsign = response.signatures[0]
 >>> blank.signature = key.unblind(secret,blindsign)
 >>> coin = blank
@@ -679 +676 @@
 >>> clientside = protocols.TransferRequest(transport,tid,blinds = blinds, coins = coins)
 >>> testserver.run_once(port,issuer=issuer,mint=mint)
->>> text,value = clientside.run()
->>> bobblank.signature = key.unblind(bobsecret,value[0])
+>>> response = clientside.run()
+>>> bobblank.signature = key.unblind(bobsecret,response.signatures[0])
 >>> bobcoin = bobblank
 >>> key.verifyContainerSignature(bobcoin)

trunk/sandbox/jhb/oc2/protocols.py

@@ -99 +99 @@
 
         response = self.transport(message)
-        header = response.header
-        if header == 'TransferReject':
-            return ('TransferReject','')
-        elif header == 'TransferDelay':
-            return ('TransferDelay','')
-        elif header == 'TransferAccept':
-            return ('TransferAccept',response.signatures)
-        else:
-            raise 'unknown thing'
+        return response
+
 
 class TransferHandling(Protocol):
@@ -143 +136 @@
         message.transactionId = self.transactionId
         response = self.transport(message)
-        header = response.header
-        if header == 'TransferReject':
-            return ('TransferReject','')
-        elif header == 'TransferDelay':
-            return ('TransferDelay','')
-        elif header == 'TransferAccept':
-            return ('TransferAccept',response.signatures)
-        else:
-            raise 'unknown thing'
-
-        return response.cdd 
+        return response
 
 class TransferResumeHandling(Protocol):