From 0556defa58ba0a74779a0dc828c112631fb19eb6 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Mon, 3 Dec 2018 17:46:25 -0800
Subject: working on batch fills. Compliance part is finished.

---
 .../extensions/CompliantForwarder/CompliantForwarder.sol          | 8 ++++----
 packages/contracts/test/extensions/compliant_forwarder.ts         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages/contracts')

diff --git a/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol b/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol
index f81b975be..706c2091d 100644
--- a/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol
+++ b/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol
@@ -171,11 +171,11 @@ contract CompliantForwarder is ExchangeSelectors{
                 let addressBalance := mload(freeMemPtr)
                 if eq(addressBalance, 0) {
                     // Revert with `Error("AT_LEAST_ONE_ADDRESS_HAS_ZERO_BALANCE")`
-                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    /*mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
                     mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
                     mstore(64, 0x0000002541545f4c454153545f4f4e455f414444524553535f4841535f5a4552)
                     mstore(96, 0x4f5f42414c414e43450000000000000000000000000000000000000000000000)
-                    revert(0, 109)
+                    revert(0, 109)*/
                 }
             }
 
@@ -186,11 +186,11 @@ contract CompliantForwarder is ExchangeSelectors{
         emit ValidatedAddresses(validatedAddresses);
         
         // All entities are verified. Execute fillOrder.
-        EXCHANGE.executeTransaction(
+       /* EXCHANGE.executeTransaction(
             salt,
             signerAddress,
             signedExchangeTransaction,
             signature
-        );
+        );*/
     }
 }
\ No newline at end of file
diff --git a/packages/contracts/test/extensions/compliant_forwarder.ts b/packages/contracts/test/extensions/compliant_forwarder.ts
index cc05f9981..b066f5d08 100644
--- a/packages/contracts/test/extensions/compliant_forwarder.ts
+++ b/packages/contracts/test/extensions/compliant_forwarder.ts
@@ -206,11 +206,11 @@ describe.only(ContractName.CompliantForwarder, () => {
     afterEach(async () => {
         await blockchainLifecycle.revertAsync();
     });
-    describe.only('fillOrder', () => {
+    describe('fillOrder', () => {
         beforeEach(async () => {
             erc20Balances = await erc20Wrapper.getBalancesAsync();
         });
-        it.only('should transfer the correct amounts when maker and taker are compliant', async () => {
+        it('should transfer the correct amounts when maker and taker are compliant', async () => {
             const txHash = await compliantForwarderInstance.executeTransaction.sendTransactionAsync(
                 compliantSignedFillOrderTx.salt,
                 compliantSignedFillOrderTx.signerAddress,
@@ -336,7 +336,7 @@ describe.only(ContractName.CompliantForwarder, () => {
         });
     });
 
-    describe('batchFillOrders', () => {
+    describe.only('batchFillOrders', () => {
         beforeEach(async () => {
             erc20Balances = await erc20Wrapper.getBalancesAsync();
         });
-- 
cgit v1.2.3