From 09e921a562bea4fa80ec19ce7a9061bbcffbd580 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 29 Jun 2018 16:50:15 +0300
Subject: Fix build after rebase

---
 packages/contract-wrappers/test/erc721_wrapper_test.ts   | 2 +-
 packages/contracts/src/utils/core_combinatorial_utils.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/contract-wrappers/test/erc721_wrapper_test.ts b/packages/contract-wrappers/test/erc721_wrapper_test.ts
index 138ff866b..e3440b9b9 100644
--- a/packages/contract-wrappers/test/erc721_wrapper_test.ts
+++ b/packages/contract-wrappers/test/erc721_wrapper_test.ts
@@ -166,7 +166,7 @@ describe('ERC721Wrapper', () => {
             );
             expect(isApprovedForAll).to.be.false();
             // set
-            const isApprovedForAll = true;
+            isApprovedForAll = true;
             let txHash = await contractWrappers.erc721Token.setApprovalForAllAsync(
                 tokenAddress,
                 ownerAddress,
diff --git a/packages/contracts/src/utils/core_combinatorial_utils.ts b/packages/contracts/src/utils/core_combinatorial_utils.ts
index 5b725fbe3..4f4045474 100644
--- a/packages/contracts/src/utils/core_combinatorial_utils.ts
+++ b/packages/contracts/src/utils/core_combinatorial_utils.ts
@@ -14,7 +14,7 @@ import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 import 'make-promises-safe';
 
-import { ExchangeContract, FillContractEventArgs } from '../generated_contract_wrappers/exchange';
+import { ExchangeContract, ExchangeFillEventArgs } from '../generated_contract_wrappers/exchange';
 import { artifacts } from '../utils/artifacts';
 import { expectRevertReasonOrAlwaysFailingTransactionAsync } from '../utils/assertions';
 import { AssetWrapper } from '../utils/asset_wrapper';
@@ -382,7 +382,7 @@ export class CoreCombinatorialUtils {
 
         expect(txReceipt.logs.length).to.be.equal(1, 'logs length');
         // tslint:disable-next-line:no-unnecessary-type-assertion
-        const log = txReceipt.logs[0] as LogWithDecodedArgs<FillContractEventArgs>;
+        const log = txReceipt.logs[0] as LogWithDecodedArgs<ExchangeFillEventArgs>;
         expect(log.args.makerAddress).to.be.equal(makerAddress, 'log.args.makerAddress');
         expect(log.args.takerAddress).to.be.equal(this.takerAddress, 'log.args.this.takerAddress');
         expect(log.args.feeRecipientAddress).to.be.equal(feeRecipient, 'log.args.feeRecipientAddress');
-- 
cgit v1.2.3