[Neuclear-develop] neuclear-bet/src/java/org/neuclear/bet BetProcessor.java,1.7,1.8

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-bet/src/java/org/neuclear/bet
In directory sc8-pr-cvs1:/tmp/cvs-serv16756/src/java/org/neuclear/bet

Modified Files:
	BetProcessor.java 
Log Message:
All unit tests in commons, id and xmlsec now work.
AssetController now successfully processes payments in the unit test.
Payment Web App has working form that creates a TransferRequest presents it to the signer
and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.

Index: BetProcessor.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-bet/src/java/org/neuclear/bet/BetProcessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BetProcessor.java	21 Nov 2003 04:42:46 -0000	1.7
--- BetProcessor.java	22 Nov 2003 00:22:00 -0000	1.8
***************
*** 8,11 ****
--- 8,12 ----
  import org.neuclear.asset.contracts.HeldTransferRequest;
  import org.neuclear.asset.contracts.TransferRequest;
+ import org.neuclear.asset.controllers.currency.CurrencyController;
  import org.neuclear.bet.eventsource.BettingEvent;
  import org.neuclear.bet.eventsource.EventOutcome;
***************
*** 17,21 ****
  import org.neuclear.commons.configuration.ConfigurationException;
  import org.neuclear.ledger.*;
- import org.neuclear.asset.controllers.currency.CurrencyController;
  
  import java.util.Date;
--- 18,21 ----
***************
*** 70,74 ****
      public final BetReceipt processBet(final BetRequest req) throws LowlevelLedgerException, BettingEventExpired {
          try {
!             final HeldTransferReceipt held = getPaymentProcessor().processHeldTransfer(new HeldTransferRequest(req.getBettor(), getPoolAccountID(req.getOutcome()), req.getAmount(), new Date(), req.getOutcome().getEvent().getClosingTime(), req.getComment()));
              try {
                  final String ticket = req.getOutcome().bet(req.getAmount());
--- 70,74 ----
      public final BetReceipt processBet(final BetRequest req) throws LowlevelLedgerException, BettingEventExpired {
          try {
!             final HeldTransferReceipt held = getPaymentProcessor().process(new HeldTransferRequest(req.getBettor(), getPoolAccountID(req.getOutcome()), req.getAmount(), new Date(), req.getOutcome().getEvent().getClosingTime(), req.getComment()));
              try {
                  final String ticket = req.getOutcome().bet(req.getAmount());
***************
*** 155,159 ****
                      throw new LowlevelLedgerException(e);
                  }
!                 getPaymentProcessor().processTransfer(
                          new TransferRequest(getPoolAccountID(winner), held.getFrom(), held.getAmount() * odds, tote.getCurrentTime(), "Won Bet: " + ticket + " on: " + winner.getId() + " at: " + event.getId())
                  );
--- 155,159 ----
                      throw new LowlevelLedgerException(e);
                  }
!                 getPaymentProcessor().process(
                          new TransferRequest(getPoolAccountID(winner), held.getFrom(), held.getAmount() * odds, tote.getCurrentTime(), "Won Bet: " + ticket + " on: " + winner.getId() + " at: " + event.getId())
                  );