Changeset 270

Timestamp:

04/21/09 21:42:46 (3 years ago)

Author:

ocjhb

Message:

yielding

Location:

trunk/sandbox/jhb/oc2

Files:

• documentation.py (modified) (2 diffs)
• messages.py (modified) (5 diffs)
• protocols.py (modified) (2 diffs)
• transports.py (modified) (1 diff)
• wallet.py (modified) (1 diff)

trunk/sandbox/jhb/oc2/documentation.py

@@ -608 +608 @@
 >>> bobwallet = Wallet({})
 
->>> aclicetid = wallet.makeSerial()
+>>> alicetid = wallet.makeSerial()
 >>> bob = protocols.SumAnnounceListen(bobwallet)
->>> alice = protocols.SumAnnounce(bob.run, wallet, 5, 'foobar') 
+>>> alice = protocols.SumAnnounce(bob.run, wallet, alicetid, 5, 'foobar') 
 >>> bobwallet.approval = "I don't like odd sums"
 >>> alice.run()
@@ -647 +647 @@
   tokens.
 
+###############################################################################
+
+>>> bob = protocols.SpendListen(bobwallet)
+>>> transport = transports.YieldTransport(bob.run,[])
+>>> alice = protocols.SpendRequest(transport, wallet, 'foobar', [coin]) 
+>>> alice.run()
+Traceback (most recent call last):
+    ....
+SpendReject: unknown transactionId
+
+>>> alice = protocols.SpendRequest(transport, wallet, alicetid, []) 
+>>> alice.run()
+Traceback (most recent call last):
+    ....
+SpendReject: amount of coins does not match announced one
+
+>>> alice = protocols.SpendRequest(transport, wallet, alicetid, [coin]) 
+>>> alice.run()
+True
+
+###############################################################################
 
 3.7 Redeeming tokens 

trunk/sandbox/jhb/oc2/messages.py

@@ -11 +11 @@
         Container.fromData(self,data)
         self.header = self.__class__.__name__
+
+class MessageException(Message,Exception):
+
+    def __str__(self):
+                return str(self.reason)
 
 class AskLatestCDD(Message):
@@ -36 +41 @@
         Field('target'),
         Field('blinds'),
-        SubitemsField('coins'),
+        SubitemsField('coins',klass=container.Coin),
         Field('options'),
     ]
@@ -86 +91 @@
      fields = Message.fields + [
         Field('transactionId'),
-        Field('sum'),
+        Field('amount'),
         Field('target'),
     ]
@@ -96 +101 @@
 
    
-class SumReject(Message):
+class SumReject(Message,Exception):
      fields = Message.fields + [
         Field('transactionId'),
@@ -102 +107 @@
     ]
 
+class SpendRequest(Message):
+     fields = Message.fields + [
+        Field('transactionId'),
+        SubitemsField('coins',klass=container.Coin),
+    ]
+
+class SpendAccept(Message):
+     fields = Message.fields + [
+        Field('transactionId'),
+    ]
 
 
+class SpendReject(MessageException):
+     fields = Message.fields + [
+        Field('transactionId'),
+        Field('problems'),
+        Field('reason'),
+    ]
+
+
+

trunk/sandbox/jhb/oc2/protocols.py

@@ -180 +180 @@
 class SumAnnounce(Protocol):
 
-    def __init__(self,transport,wallet,sum,target):
-        self.transport = transport
-        self.sum = sum
+    def __init__(self,transport,wallet,tid,amount,target):
+        self.transport = transport
+        self.amount = amount
         self.target = target
-        self.wallet = wallet
-    
-    def run(self,message=None):
-        tid = self.wallet.makeSerial()
+        self.tid = tid
+        self.wallet = wallet
+    
+    def run(self,message=None):
         message = messages.SumAnnounce()
-        message.transactionId = tid
-        message.sum = self.sum
+        message.transactionId = self.tid
+        message.amount = self.amount    
         message.target = self.target
         self.wallet.addOutgoing(message)
         response = self.transport(message)
-        if response.header == 'SumAccept':
+        if response.header == 'SumReject':
+            return response.reason
+        else:
             return True
-        else:
-            return response.reason
 
 
@@ -215 +215 @@
         return answer
 
+
+class SpendRequest(Protocol):
+
+    def __init__(self,transport,wallet,tid,coins):
+        self.transport = transport
+        self.wallet = wallet
+        self.tid = tid
+        self.coins = coins
+    
+    def run(self,message=None):
+        message = messages.SpendRequest() 
+        message.transactionId = self.tid
+        message.coins = self.coins
+        response = self.transport(message)
+        if response.header == 'SpendReject':
+            raise response
+        else:
+            return True
+
+class SpendListen(Protocol):
+    
+    def __init__(self,wallet):
+        self.wallet = wallet
+    
+    def run(self,message=None):
+        tid = message.transactionId
+        amount = sum([int(m.denomination) for m in message.coins])
+        #check transactionid
+        orig = self.wallet.getIncoming(tid)
+        if not orig:
+            answer = messages.SpendReject()
+            answer.reason = 'unknown transactionId'
+            yield answer
+            return
+        #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
+        answer = messages.SpendAccept()
+        answer.transactionId = tid
+        yield answer
+
 class CoinsSpendSender(Protocol):
 

trunk/sandbox/jhb/oc2/transports.py

@@ -23 +23 @@
         return createMessage(response.read())
         
+class YieldTransport(object):
 
+    def __init__(self,targetmethod,args):
+        self.args = args
+        self.targetmethod = targetmethod
+        self.nextarg = None
+
+    def __call__(self,message):
+        gen = self.targetmethod(message)
+        response = None
+        for result in gen:
+            if result != None:
+                response = result
+        return response            
+                    
+

trunk/sandbox/jhb/oc2/wallet.py

@@ -21 +21 @@
         self.storage.setdefault('outgoing',{})[message.transactionId] = message
 
+    def getOutgoing(self,tid):
+        return self.storage.setdefault('outgoing',{})[tid]
+
     def addIncoming(self,message):
         self.storage.setdefault('incoming',{})[message.transactionId] = message
+        
+    def getIncoming(self,tid):
+        return self.storage.setdefault('incoming',{}).get(tid,None)
 
     def getApproval(self,message):
-        sum = message.sum
-        target = message.sum
+        amount = message.amount
+        target = message.target
         approval = getattr(self,'approval',True) #get that from ui
         if approval == True: