[Neuclear-develop] neuclear-pay/src/test/org/neuclear/asset/receiver PaymentReceiverTest.java,1.16,1.17

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2965/src/test/org/neuclear/asset/receiver

Modified Files:
	PaymentReceiverTest.java 
Log Message:
The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.

Index: PaymentReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PaymentReceiverTest.java	2 Mar 2004 18:58:35 -0000	1.16
--- PaymentReceiverTest.java	21 Mar 2004 00:48:45 -0000	1.17
***************
*** 5,25 ****
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.controllers.currency.CurrencyController;
  import org.neuclear.asset.orders.TransferGlobals;
  import org.neuclear.asset.orders.TransferOrder;
- import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.builders.TransferOrderBuilder;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
- import org.neuclear.commons.sql.DefaultConnectionSource;
- import org.neuclear.commons.sql.statements.SimpleStatementFactory;
- import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.resolver.NSResolver;
- import org.neuclear.ledger.BookExistsException;
  import org.neuclear.ledger.LowlevelLedgerException;
  import org.neuclear.ledger.UnknownLedgerException;
- import org.neuclear.ledger.implementations.SQLLedger;
- import org.neuclear.id.receiver.Receiver;
  import org.neuclear.tests.AbstractSigningTest;
  import org.neuclear.xml.XMLException;
--- 5,20 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.controllers.currency.CurrencyController;
+ import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.TransferGlobals;
  import org.neuclear.asset.orders.TransferOrder;
  import org.neuclear.asset.orders.builders.TransferOrderBuilder;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
+ import org.neuclear.id.receiver.Receiver;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.ledger.LowlevelLedgerException;
  import org.neuclear.ledger.UnknownLedgerException;
  import org.neuclear.tests.AbstractSigningTest;
  import org.neuclear.xml.XMLException;
***************
*** 51,54 ****
--- 46,52 ----
  $Id$
  $Log$
+ Revision 1.17  2004/03/21 00:48:45  pelle
+ The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
+ 
  Revision 1.16  2004/03/02 18:58:35  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 179,183 ****
   */
  public final class PaymentReceiverTest extends AbstractSigningTest {
!     public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException, SQLException, NamingException {
          super(string);
          AssetGlobals.registerReaders();
--- 177,181 ----
   */
  public final class PaymentReceiverTest extends AbstractSigningTest {
!     public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, IOException, InvalidTransferException, XMLException, SQLException, NamingException {
          super(string);
          AssetGlobals.registerReaders();
***************
*** 185,197 ****
          asset = (Asset) NSResolver.resolveIdentity(assetName);
  
!         proc = new CurrencyController(
!                 new SQLLedger(
!                         new SimpleStatementFactory(new DefaultConnectionSource()),
!                         assetName
!                 ),
                  new TestCaseSigner(),
!                 assetName
!         );
!         receiver=proc;
      }
  
--- 183,190 ----
          asset = (Asset) NSResolver.resolveIdentity(assetName);
  
!         proc = new CurrencyController(null,
                  new TestCaseSigner(),
!                 assetName);
!         receiver = proc;
      }
  
***************
*** 224,229 ****
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getSignatory(), transfer.getTimeStamp());
!             final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
  
              return new double[]{fromBalance, toBalance};
--- 217,222 ----
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getSignatory());
!             final double toBalance = proc.getBalance(transfer.getRecipient());
  
              return new double[]{fromBalance, toBalance};
***************
*** 236,241 ****
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getSignatory(), transfer.getTimeStamp());
!             final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
              final double prebalances[] = (double[]) state;
  
--- 229,234 ----
          if (obj instanceof TransferOrder) {
              final TransferOrder transfer = (TransferOrder) obj;
!             final double fromBalance = proc.getBalance(transfer.getSignatory());
!             final double toBalance = proc.getBalance(transfer.getRecipient());
              final double prebalances[] = (double[]) state;
  
***************
*** 248,252 ****
      public final SignedNamedObject createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException {
          final TransferOrderBuilder transfer = new TransferOrderBuilder(asset, to, new Amount(amount), "Test One");
!         return transfer.convert(from.getName(),getSigner());
      }
  
--- 241,245 ----
      public final SignedNamedObject createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException {
          final TransferOrderBuilder transfer = new TransferOrderBuilder(asset, to, new Amount(amount), "Test One");
!         return transfer.convert(from.getName(), getSigner());
      }