Changeset 339

Timestamp:

11/29/11 19:49:58 (6 months ago)

Author:

ocjhb

Message:

fixing bugs in the call to the walle library; allow pasing of port and storagepath to ocwallet.py in order to run more then one at the same time

Location:

trunk/sandbox/jhb

Files:

• mobile/ocwallet.py (modified) (6 diffs)
• oc2/demoissuer.py (modified) (2 diffs)
• oc2/documentation.py (modified) (2 diffs)
• oc2/occrypto.py (modified) (1 diff)
• oc2/wallet.py (modified) (1 diff)
• webwallet/cgi/wallet.cgi (modified) (1 diff)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -278 +278 @@
             def server_bind(self):
                 BaseHTTPServer.HTTPServer.server_bind(self)
-                self.socket.settimeout(0.5)
+                self.socket.settimeout(60)
                 self.run = True
 
@@ -314 +314 @@
                     answer = self.wallet.listenSum(message)
                 if message.header == 'SpendRequest':
-                    answer = self.wallet.listenSpend(transport,message)
+                    answer = self.wallet.listenSpend(message=message,transport=transport)
                 self.send_response(200)
                 self.send_header("Content-type", "text/plain")
@@ -541 +541 @@
 
 ############################### main code ############################        
+import sys
 
 #what port do we listen on?
-walletport = 9091
+if len(sys.argv) > 1:
+    walletport = int(sys.argv[1])
+else:    
+    walletport = 9091
 
 #setting up the environment
@@ -553 +557 @@
 
 import oc2
-import sys
 
 #finding out where we are, in order to get the icons
@@ -568 +571 @@
 else:
     mediapath = u''
-    storagepath=u''
-        
+    print sys.argv
+    if len(sys.argv)>2:
+        storagepath=unicode(sys.argv[2])
+    else:        
+        storagepath=u''
 #only for documenting it
 #from graphics import *
@@ -628 +634 @@
 startup('transports')
 from oc2 import transports
+transports.printmessages = 1
 startup('media')
 coinsound = audio.Sound.open(mediapath+u'coinsound.wav')

trunk/sandbox/jhb/oc2/demoissuer.py

@@ -4 +4 @@
 
 #where can this server be reached?
-baseurl = 'http://192.168.2.101'
+baseurl = 'http://localhost'
 #what port to run on?
 port = 9090
@@ -12 +12 @@
 import BaseHTTPServer
 import issuer, mint,authorizer,storage
-from testserver import Handler
+from testutils import Handler
 
 issuerstorage = storage.Storage().setFilename('data/issuerstorage.bin').restore()

trunk/sandbox/jhb/oc2/documentation.py

@@ -7 +7 @@
 are generated by the 'printSection' commands in this file.
 
-
+>>> import time
+>>> start = time.time()
 >>> import transports
 >>> from transports import DirectTransport as DT
@@ -254 +255 @@
 'TransferAccept'
 
-
+>>> #print time.time()-start
 """
 

trunk/sandbox/jhb/oc2/occrypto.py

@@ -17 +17 @@
         items = value.items()
         items.sort()
+        #items = [(key,hex(val)) for key,val in items]
         return items
 
     def setdecoded(self,object,data):
+        #data = [(key,int(val,0)) for key,val in data]
         setattr(object,self.name,dict(data))
 

trunk/sandbox/jhb/oc2/wallet.py

@@ -143 +143 @@
 
     def listenSpend(self,message,transport=None):
+        print message
         tid = message.transactionId
         amount = sum([int(m.denomination) for m in message.coins])

trunk/sandbox/jhb/webwallet/cgi/wallet.cgi

@@ -274 +274 @@
             cdd,wehave = self.getCurrency(message.coins[0].currencyId)
             transport = transports.HTTPTransport(cdd.issuerServiceLocation)
-            answer = self.wallet.listenSpend(transport,message)
+            answer = self.wallet.listenSpend(transport=transport,message=message)
         self.storage.save()
         self.mimetype='text/plain'