crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build after rebase

Browse Source
This commit is contained in:
Leonid Logvinov
2018-06-29 16:50:15 +03:00
parent 13cbaf56b2
commit 09e921a562
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contract-wrappers/test/erc721_wrapper_test.ts
View File

@@ -166,7 +166,7 @@ describe('ERC721Wrapper', () => {
); );
expect(isApprovedForAll).to.be.false(); expect(isApprovedForAll).to.be.false();
// set // set
const isApprovedForAll = true; isApprovedForAll = true;
let txHash = await contractWrappers.erc721Token.setApprovalForAllAsync( let txHash = await contractWrappers.erc721Token.setApprovalForAllAsync(
tokenAddress, tokenAddress,
ownerAddress, ownerAddress,

4
packages/contracts/src/utils/core_combinatorial_utils.ts
View File

@@ -14,7 +14,7 @@ import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import 'make-promises-safe'; 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 { artifacts } from '../utils/artifacts';
import { expectRevertReasonOrAlwaysFailingTransactionAsync } from '../utils/assertions'; import { expectRevertReasonOrAlwaysFailingTransactionAsync } from '../utils/assertions';
import { AssetWrapper } from '../utils/asset_wrapper'; import { AssetWrapper } from '../utils/asset_wrapper';
@@ -382,7 +382,7 @@ export class CoreCombinatorialUtils {
expect(txReceipt.logs.length).to.be.equal(1, 'logs length'); expect(txReceipt.logs.length).to.be.equal(1, 'logs length');
// tslint:disable-next-line:no-unnecessary-type-assertion // 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.makerAddress).to.be.equal(makerAddress, 'log.args.makerAddress');
expect(log.args.takerAddress).to.be.equal(this.takerAddress, 'log.args.this.takerAddress'); expect(log.args.takerAddress).to.be.equal(this.takerAddress, 'log.args.this.takerAddress');
expect(log.args.feeRecipientAddress).to.be.equal(feeRecipient, 'log.args.feeRecipientAddress'); expect(log.args.feeRecipientAddress).to.be.equal(feeRecipient, 'log.args.feeRecipientAddress');