Changeset 271 for trunk

Timestamp:

04/22/09 18:46:54 (3 years ago)

Author:

ocjhb

Message:

working on it

Location:

trunk/sandbox/jhb/oc2

Files:

• documentation.py (modified) (3 diffs)
• issuerservice.py (copied) (copied from trunk/sandbox/jhb/oc2/testserver.py)
• mint.py (modified) (3 diffs)
• protocols.py (modified) (3 diffs)
• testclient.py (copied) (copied from trunk/sandbox/jhb/oc2/testserver.py)

trunk/sandbox/jhb/oc2/documentation.py

@@ -651 +651 @@
 >>> bob = protocols.SpendListen(bobwallet)
 >>> transport = transports.YieldTransport(bob.run,[])
->>> alice = protocols.SpendRequest(transport, wallet, 'foobar', [coin]) 
+>>> alice = protocols.SpendRequest(bob.run, wallet, 'foobar', [coin]) 
 >>> alice.run()
 Traceback (most recent call last):
@@ -657 +657 @@
 SpendReject: unknown transactionId
 
->>> alice = protocols.SpendRequest(transport, wallet, alicetid, []) 
+>>> alice = protocols.SpendRequest(bob.run, wallet, alicetid, []) 
 >>> alice.run()
 Traceback (most recent call last):
@@ -663 +663 @@
 SpendReject: amount of coins does not match announced one
 
->>> alice = protocols.SpendRequest(transport, wallet, alicetid, [coin]) 
+>>> alice = protocols.SpendRequest(bob.run, wallet, alicetid, [coin]) 
 >>> alice.run()
 True

trunk/sandbox/jhb/oc2/mint.py

@@ -1 +1 @@
 from entity import *
+import messages
 
 class Mint(Entity):
@@ -53 +54 @@
         return key.verifyContainerSignature(message)
 
-    def handleTransferRequest(self,authorizedMessage):
+    def handleMintingRequest(self,authorizedMessage):
          
         if not self.validateAuthorization(authorizedMessage):
-            return ('nonvalid','')
-        else: 
-            message = authorizedMessage.message
+            return messages.TransferReject()
+         
+        message = authorizedMessage.message
         blinds = message.blinds
         result = []
@@ -67 +68 @@
 
         if self.delay:
-            
             self.addToTransactions(message.transactionId,result)
-            return('delayed','mint asked to delay')
+            answer =  messages.TransferDelay()
+            answer.transactionId = message.transactionId
+            answer.reason = 'mint asked to delay'
         else:            
-            return ('minted',result)
+            answer = messages.TransferAccept()
+            answer.signatures = result
+        
+        return answer
+    
+    def handleExchangeRequest(self,message):
+        coins = message.coins
+        blinds = message.blinds
+
+
 
     def addToTransactions(self,transactionId,result):

trunk/sandbox/jhb/oc2/protocols.py

@@ -118 +118 @@
         options = dict(message.options)
         requesttype = options['type']
+        
         if requesttype == 'mint':
             authorizedMessage = self.authorizer.authorize(message)
             if type(authorizedMessage) == messages.Error:
                 return messages.TransferReject()
-                 
-            response  = self.mint.handleTransferRequest(authorizedMessage)
-            if type(response) == messages.Error:
-                return messages.TransferReject()
-
-            text,value = response
-            if text=='minted':
-                answer = messages.TransferAccept()
-                answer.signatures = value
-            elif text =='delayed':
-                answer = messages.TransferDelay()
-                answer.transactionId = message.transactionId
-                answer.reason = value
-            else:
-                raise 'something went wrong'
-        return answer    
+            return self.mint.handleMintingRequest(authorizedMessage)
+        
+        elif requesttype == 'exchange':
+            return self.mint.handleExchangeRequest(message)
+            
+
 
 class TransferResume(Protocol):
@@ -234 +225 @@
             return True
 
+   
 class SpendListen(Protocol):
     
@@ -247 +239 @@
             answer = messages.SpendReject()
             answer.reason = 'unknown transactionId'
-            yield answer
-            return
+            return answer
         #check sum
         if amount != int(orig.amount):
             answer = messages.SpendReject()
             answer.reason = 'amount of coins does not match announced one'
-            yield answer
-            return
-        yield 'trying to exchange' 
-        #try to exchange. To yield or not to yield?
-        import pdb; pdb.set_trace()
-        #return answer
+            return answer
+        #do exchange
+
+
         answer = messages.SpendAccept()
         answer.transactionId = tid
-        yield answer
+        return answer
+           
+
 
 class CoinsSpendSender(Protocol):