Changeset 1697:a680bd74a37d

Timestamp:

07/10/08 14:33:10 (3 months ago)

Author:

klai@…

Branch:

default

Message:

Sanity checking on output from bank (from Rik)

Location:

src/Tycoon

Files:

• BankClient.py (modified) (1 diff)
• BankSecurity.py (modified) (3 diffs)

src/Tycoon/BankClient.py

@@ -290 +290 @@
             raise BankClientException(e)
 
-        ht = self.__bank_security.parse_receipt(receipt)
+        ht = self.__bank_security.parse_receipt(receipt, ('Tx_Amount', 'Transfer_From', 'Transfer_To', 'Tx_comment'))
+        for ht_key in ('Tx_Amount', 'Transfer_From', 'Transfer_To', 'Tx_Comment'):
+            if ht_key not in ht or ht[ht_key] is None:
+                raise BankClientException(
+                    'Malformed bank response, results does not contain the '+\
+                    '%s key' % ht_key)
             
         #convert the amount to decimal 

src/Tycoon/BankSecurity.py

@@ -20 +20 @@
 #
 import datetime, decimal, os.path, re, time
+from types import TupleType
 from KL.Security.Signer import Signer
 from KL.Network.TimeStampBuffer import TimeStampBuffer
@@ -39 +40 @@
         self.__re = None
 
-    def parse_receipt(self, receipt):
+    def parse_receipt(self, receipt, keys=None):
         #tokenize the receipt into a hashtable containing the receipt contents
         tokens = receipt.split("|")
@@ -47 +48 @@
             if t != None and len(t) == 2:
                  ht[t[0]] = t[1]
+
+        if keys is not None and isinstance(keys, TupleType):
+            for key in keys:
+                if key not in ht:
+                    ht[key] = None
+
         return ht