From 771c88ec791cb6bedf2ddd3418e89dec1581e326 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 1 Jun 2017 16:11:25 +0200
Subject: Revert "Add EXPIRED test"

This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c.
---
 test/exchange_wrapper_test.ts | 38 ++++++++++++++++----------------------
 test/utils/order_factory.ts   | 10 +++-------
 2 files changed, 19 insertions(+), 29 deletions(-)

(limited to 'test')

diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index f929df149..c5cbc58be 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -107,9 +107,6 @@ describe('ExchangeWrapper', () => {
         let tokens: Token[];
         const addressBySymbol: {[symbol: string]: string} = {};
         let networkId: number;
-        let maker: string;
-        let taker: string;
-        const fillAmount = new BigNumber(5);
         const setBalance = async (toAddress: string,
                                   amountInBaseUnits: BigNumber.BigNumber|number,
                                   tokenAddress: string) => {
@@ -129,43 +126,40 @@ describe('ExchangeWrapper', () => {
             });
             networkId = await promisify(web3.version.getNetwork)();
         });
-        beforeEach('get ready for fill', async () => {
-            [maker, taker] = userAddresses;
-            zeroEx.setDefaultAccount(taker);
-            await setAllowance(maker, 5, addressBySymbol.MLN);
-            await setBalance(taker, 5, addressBySymbol.GNT);
-            await setAllowance(taker, 5, addressBySymbol.GNT);
-        });
-        afterEach('reset sender', () => {
-            zeroEx.setDefaultAccount(userAddresses[0]);
-        });
         describe('failed fills', () => {
             it('should throw when the fill amount is zero', async () => {
+                const maker = userAddresses[0];
+                const taker = userAddresses[0];
                 const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, maker, taker,
                     5, addressBySymbol.MLN, 5, addressBySymbol.GNT);
+                const fillAmount = new BigNumber(0);
                 expect(zeroEx.exchange.fillOrderAsync(signedOrder, fillAmount))
                     .to.be.rejectedWith(FillOrderValidationErrs.FILL_AMOUNT_IS_ZERO);
             });
             it('should throw when sender is not a taker', async () => {
+                const maker = userAddresses[0];
+                const taker = userAddresses[1];
                 const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, maker, taker,
                     5, addressBySymbol.MLN, 5, addressBySymbol.GNT);
-                const notTaker = userAddresses[2];
-                zeroEx.setDefaultAccount(notTaker);
+                const fillAmount = new BigNumber(5);
                 expect(zeroEx.exchange.fillOrderAsync(signedOrder, fillAmount))
                     .to.be.rejectedWith(FillOrderValidationErrs.NOT_A_TAKER);
             });
-            it('should throw when order is expired', async () => {
-                const OLD_TIMESTAMP = new BigNumber(42);
-                const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, maker, taker,
-                    5, addressBySymbol.MLN, 5, addressBySymbol.GNT, OLD_TIMESTAMP);
-                expect(zeroEx.exchange.fillOrderAsync(signedOrder, fillAmount))
-                    .to.be.rejectedWith(FillOrderValidationErrs.EXPIRED);
-            });
         });
         describe('successful fills', () => {
+            afterEach('reset default account', () => {
+               zeroEx.setDefaultAccount(userAddresses[0]);
+            });
             it('should fill the valid order', async () => {
+                const maker = userAddresses[0];
+                const taker = userAddresses[1];
+                await setAllowance(maker, 5, addressBySymbol.MLN);
+                await setBalance(taker, 5, addressBySymbol.GNT);
+                await setAllowance(taker, 5, addressBySymbol.GNT);
                 const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, maker, taker,
                     5, addressBySymbol.MLN, 5, addressBySymbol.GNT);
+                const fillAmount = new BigNumber(5);
+                zeroEx.setDefaultAccount(taker);
                 await zeroEx.exchange.fillOrderAsync(signedOrder, fillAmount);
                 expect(await zeroEx.token.getBalanceAsync(addressBySymbol.MLN, taker)).to.be.bignumber.equal(5);
                 expect(await zeroEx.token.getBalanceAsync(addressBySymbol.GNT, taker)).to.be.bignumber.equal(0);
diff --git a/test/utils/order_factory.ts b/test/utils/order_factory.ts
index c6c6ed927..e41e973ee 100644
--- a/test/utils/order_factory.ts
+++ b/test/utils/order_factory.ts
@@ -14,14 +14,10 @@ export const orderFactory = {
         makerTokenAmount: BigNumber.BigNumber|number,
         makerTokenAddress: string,
         takerTokenAmount: BigNumber.BigNumber|number,
-        takerTokenAddress: string,
-        expirationUnixTimestampSec?: BigNumber.BigNumber): Promise<SignedOrder> {
+        takerTokenAddress: string): Promise<SignedOrder> {
         // TODO refactor and check
         const exchangeAddress: string = (ExchangeArtifacts as any).networks[networkId].address;
-        const INF_TIMESTAMP = new BigNumber(2524604400);
-        expirationUnixTimestampSec = _.isUndefined(expirationUnixTimestampSec) ?
-            INF_TIMESTAMP :
-            expirationUnixTimestampSec;
+        const INF_TIMESTAMP = 2524604400;
         const order = {
             maker,
             taker,
@@ -33,7 +29,7 @@ export const orderFactory = {
             takerTokenAddress,
             salt: ZeroEx.generatePseudoRandomSalt(),
             feeRecipient: constants.NULL_ADDRESS,
-            expirationUnixTimestampSec,
+            expirationUnixTimestampSec: new BigNumber(INF_TIMESTAMP),
         };
         const orderHash = ZeroEx.getOrderHashHex(exchangeAddress, order);
         const ecSignature = await zeroEx.signOrderHashAsync(orderHash);
-- 
cgit v1.2.3