Fix tests now that we no longer fire duplicate orderWatcher events
This commit is contained in:
		@@ -180,16 +180,12 @@ describe('OrderStateWatcher', () => {
 | 
			
		||||
                const orderHash = ZeroEx.getOrderHashHex(signedOrder);
 | 
			
		||||
                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 | 
			
		||||
 | 
			
		||||
                let eventCount = 0;
 | 
			
		||||
                const callback = reportCallbackErrors(done)((orderState: OrderState) => {
 | 
			
		||||
                    eventCount++;
 | 
			
		||||
                    expect(orderState.isValid).to.be.false();
 | 
			
		||||
                    const invalidOrderState = orderState as OrderStateInvalid;
 | 
			
		||||
                    expect(invalidOrderState.orderHash).to.be.equal(orderHash);
 | 
			
		||||
                    expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderRemainingFillAmountZero);
 | 
			
		||||
                    if (eventCount === 2) {
 | 
			
		||||
                        done();
 | 
			
		||||
                    }
 | 
			
		||||
                    done();
 | 
			
		||||
                });
 | 
			
		||||
                zeroEx.orderStateWatcher.subscribe(callback);
 | 
			
		||||
 | 
			
		||||
@@ -212,9 +208,7 @@ describe('OrderStateWatcher', () => {
 | 
			
		||||
                const orderHash = ZeroEx.getOrderHashHex(signedOrder);
 | 
			
		||||
                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 | 
			
		||||
 | 
			
		||||
                let eventCount = 0;
 | 
			
		||||
                const callback = reportCallbackErrors(done)((orderState: OrderState) => {
 | 
			
		||||
                    eventCount++;
 | 
			
		||||
                    expect(orderState.isValid).to.be.true();
 | 
			
		||||
                    const validOrderState = orderState as OrderStateValid;
 | 
			
		||||
                    expect(validOrderState.orderHash).to.be.equal(orderHash);
 | 
			
		||||
@@ -226,9 +220,7 @@ describe('OrderStateWatcher', () => {
 | 
			
		||||
                    expect(orderRelevantState.remainingFillableTakerTokenAmount).to.be.bignumber.equal(
 | 
			
		||||
                        remainingFillable);
 | 
			
		||||
                    expect(orderRelevantState.makerBalance).to.be.bignumber.equal(remainingMakerBalance);
 | 
			
		||||
                    if (eventCount === 2) {
 | 
			
		||||
                        done();
 | 
			
		||||
                    }
 | 
			
		||||
                    done();
 | 
			
		||||
                });
 | 
			
		||||
                zeroEx.orderStateWatcher.subscribe(callback);
 | 
			
		||||
                const shouldThrowOnInsufficientBalanceOrAllowance = true;
 | 
			
		||||
@@ -267,9 +259,7 @@ describe('OrderStateWatcher', () => {
 | 
			
		||||
                    const fillAmountInBaseUnits = ZeroEx.toBaseUnitAmount(new BigNumber(2), decimals);
 | 
			
		||||
                    const orderHash = ZeroEx.getOrderHashHex(signedOrder);
 | 
			
		||||
                    await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 | 
			
		||||
                    let eventCount = 0;
 | 
			
		||||
                    const callback = reportCallbackErrors(done)((orderState: OrderState) => {
 | 
			
		||||
                        eventCount++;
 | 
			
		||||
                        expect(orderState.isValid).to.be.true();
 | 
			
		||||
                        const validOrderState = orderState as OrderStateValid;
 | 
			
		||||
                        expect(validOrderState.orderHash).to.be.equal(orderHash);
 | 
			
		||||
@@ -278,9 +268,7 @@ describe('OrderStateWatcher', () => {
 | 
			
		||||
                            ZeroEx.toBaseUnitAmount(new BigNumber(16), decimals));
 | 
			
		||||
                        expect(orderRelevantState.remainingFillableTakerTokenAmount).to.be.bignumber.equal(
 | 
			
		||||
                            ZeroEx.toBaseUnitAmount(new BigNumber(8), decimals));
 | 
			
		||||
                        if (eventCount === 2) {
 | 
			
		||||
                            done();
 | 
			
		||||
                        }
 | 
			
		||||
                        done();
 | 
			
		||||
                    });
 | 
			
		||||
                    zeroEx.orderStateWatcher.subscribe(callback);
 | 
			
		||||
                    const shouldThrowOnInsufficientBalanceOrAllowance = true;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user