[Webfunds-commits] java/webfunds/client/sox SOXWallet.java

Ian Grigg iang@cypherpunks.ai
Thu, 30 Nov 2000 09:46:32 -0400 (AST) 

iang        00/11/30 09:46:31

  Modified:    webfunds/client/sox SOXWallet.java
  Log:
  withdraw now calls withdraw()

Revision  Changes    Path
1.139     +10 -7     java/webfunds/client/sox/SOXWallet.java

Index: SOXWallet.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/sox/SOXWallet.java,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- SOXWallet.java	2000/11/09 13:28:20	1.138
+++ SOXWallet.java	2000/11/30 13:46:31	1.139
@@ -1,4 +1,4 @@
-/* $Id: SOXWallet.java,v 1.138 2000/11/09 13:28:20 iang Exp $
+/* $Id: SOXWallet.java,v 1.139 2000/11/30 13:46:31 iang Exp $
  *
  * Copyright (c) Systemics Inc. 1995-2000 on behalf of
  * The WebFunds Development Team.  All Rights Reserved.
@@ -1052,14 +1052,13 @@
 // actually, what is the point of saving a proto payment?
 //        savePaymentAsPending(src, proto);
 
-
         //
         //  Beyond this point, failure leaves a dangling payment,
         //  cancel manually for now.
         //
         MailItem[] mails;
         try {
-            mails = sub.deposit(pay, new String(desc), null);
+            mails = sub.withdraw(pay, proto, new String(desc), null);
         } catch (SOXLaterException ex) {
             throw new PaymentException(ex.getNumber(), "Later: " + ex);
         } catch (SOXSubAccountException ex) {
@@ -2623,7 +2622,7 @@
             confirms = tryHandle(sub, mails);
 
         //
-        //  Spin around getting and siging for mail.
+        //  Spin around getting and signing for mail.
         //  Would often be two cycles, might be 3 if
         //  something arrived during the process.
         //  Too many cycles would probably indicate a bug
@@ -2708,12 +2707,16 @@
         //  Have received some more mail,
         //  save them and ready them for confirm
         //
-        logmsg("received " + mails.length + " mail items");
+        logmsg("tryHandle() received " + mails.length + " mail items");
         for (int i = 0; i < mails.length; i++)
         {
             MailItem mail = mails[i];
             if (handleMail(mail, sub))      // handle mail, and
-                newConfirms.addElement(mail.getMailId());  // confirm
+            {
+                MailId id = mail.getMailId();  // confirm this number
+                newConfirms.addElement(id);  // confirm
+                logmsg("uccessfully saved " + id);
+            }
         }
 
         MailId[] confirms = new MailId[newConfirms.size()];
@@ -2763,7 +2766,7 @@
             logmsg(Hex.data2hex(recdata));
             return false ;
         }
-        logmsg("Receipt : " + rec);
+        logmsg("handleReceiptData(): " + rec);
         return handleReceipt(rec, acct);
     }