Changeset 269 for trunk

Timestamp:

04/21/09 18:16:11 (3 years ago)

Author:

ocjhb

Message:

SumAnnounce?

Location:

trunk/sandbox/jhb/oc2

Files:

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

trunk/sandbox/jhb/oc2/containerbase.py

@@ -97 +97 @@
     fields = []
 
-    def __init__(self,data={}):
+    def __init__(self,data={},**kwargs):
+        if not data and kwargs:
+            data = kwargs
         self.fromData(data)
 
@@ -116 +118 @@
         if type(data) != type({}):
             data = dict(data)
+
         for field in self.fields:
             if data.has_key(field.name):

trunk/sandbox/jhb/oc2/documentation.py

@@ -603 +603 @@
         or  SUM_REJECT( transaction_id, "Reason" )
 
+###############################################################################
+
+>>> bobport = 9091
+>>> bobwallet = Wallet({})
+
+>>> aclicetid = wallet.makeSerial()
+>>> bob = protocols.SumAnnounceListen(bobwallet)
+>>> alice = protocols.SumAnnounce(bob.run, wallet, 5, 'foobar') 
+>>> bobwallet.approval = "I don't like odd sums"
+>>> alice.run()
+"I don't like odd sums"
+
+>>> bobwallet.approval = True
+>>> alice.run()
+True
+
+###############################################################################
 
 * Wallet Alice sends tokens to Wallet Bob (this time including their clear 

trunk/sandbox/jhb/oc2/messages.py

@@ -51 +51 @@
         Field('signature',signing=False)
     ]
-class Error(Message):
+class Error(Message, Exception):
     fields = Message.fields + [
         Field('text'),
@@ -73 +73 @@
     ]
 
+class TransferResume(Message):
+     fields = Message.fields + [
+        Field('transactionId'),
+    ]
 
+class TransferResume(Message):
+     fields = Message.fields + [
+        Field('transactionId'),
+    ]
+
+class SumAnnounce(Message):
+     fields = Message.fields + [
+        Field('transactionId'),
+        Field('sum'),
+        Field('target'),
+    ]
+
+class SumAccept(Message):
+     fields = Message.fields + [
+        Field('transactionId'),
+    ]
+
+   
+class SumReject(Message):
+     fields = Message.fields + [
+        Field('transactionId'),
+        Field('reason'),
+    ]
+
+
+

trunk/sandbox/jhb/oc2/protocols.py

@@ -178 +178 @@
         return answer    
 
+class SumAnnounce(Protocol):
+
+    def __init__(self,transport,wallet,sum,target):
+        self.transport = transport
+        self.sum = sum
+        self.target = target
+        self.wallet = wallet
+    
+    def run(self,message=None):
+        tid = self.wallet.makeSerial()
+        message = messages.SumAnnounce()
+        message.transactionId = tid
+        message.sum = self.sum
+        message.target = self.target
+        self.wallet.addOutgoing(message)
+        response = self.transport(message)
+        if response.header == 'SumAccept':
+            return True
+        else:
+            return response.reason
+
+
+class SumAnnounceListen(Protocol):
+    
+    def __init__(self,wallet):
+        self.wallet = wallet
+    
+    def run(self,message=None):
+        approval = self.wallet.getApproval(message)
+        if approval == True:
+            answer = messages.SumAccept()
+        else:
+            answer = messages.SumReject()
+            answer.reason = approval
+        answer.transactionId = message.transactionId            
+        return answer
 
 class CoinsSpendSender(Protocol):

trunk/sandbox/jhb/oc2/wallet.py

@@ -17 +17 @@
     def makeSerial(self):
         return occrypto.createSerial()
+    
+    def addOutgoing(self,message):
+        self.storage.setdefault('outgoing',{})[message.transactionId] = message
+
+    def addIncoming(self,message):
+        self.storage.setdefault('incoming',{})[message.transactionId] = message
+
+    def getApproval(self,message):
+        sum = message.sum
+        target = message.sum
+        approval = getattr(self,'approval',True) #get that from ui
+        if approval == True:
+            self.addIncoming(message)
+        return approval
+        
+