Changeset 327 for trunk/sandbox/jhb/oc2/wallet.py

Timestamp:

06/15/09 02:46:06 (3 years ago)

Author:

ocjhb

Message:

webwallet can now do basic actions

Files:

• trunk/sandbox/jhb/oc2/wallet.py (modified) (4 diffs)

trunk/sandbox/jhb/oc2/wallet.py

@@ -4 +4 @@
 import messages
 import coinsplitting
+import sys
 
 class Wallet(Entity):
@@ -30 +31 @@
     def addIncoming(self,message):
         self.storage.setdefault('incoming',{})[message.transactionId] = message
-        
+        #sys.stderr.write(str(self.storage.filename))
+
     def getIncoming(self,tid):
-        return self.storage.setdefault('incoming',{}).get(tid,None)
+        #sys.stderr.write(str(tid)) 
+        #sys.stderr.write(str(self.storage.filename)) 
+        transaction = self.storage.setdefault('incoming',{}).get(tid,None)
+        if transaction != None:
+            del(self.storage['incoming'][tid])
+        return transaction            
 
         
@@ -180 +187 @@
                 out.append((cdd,amount))
             except:
-                del(self.storage[key])
+                #del(self.storage[key]) XXX why was that?
+                pass
         return out            
 
@@ -333 +341 @@
         
         self.feedback(u'Spending coins: wating for confirmation')
-        self.announceSum(transport,tid,amount,target)
+        response = self.announceSum(transport,tid,amount,target)
         self.feedback(u'Spending coins: wating for other side')
         response = self.requestSpend(transport,tid,picked)