Rebase against 3.0

This commit is contained in:
Lawrence Forman
2019-06-24 13:23:41 -04:00
committed by Amir Bandeali
parent c2752d5931
commit 2ff3735adc
3 changed files with 7 additions and 94 deletions

View File

@@ -76,6 +76,8 @@ describe('Exchange core', () => {
let multiAssetProxy: MultiAssetProxyContract;
let validatorWallet: TestValidatorWalletContract;
let erc1155Contract: ERC1155MintableContract;
let staticCallProxy: StaticCallProxyContract;
let staticCallTarget: TestStaticCallTargetContract;
let signedOrder: SignedOrder;
let erc20Balances: ERC20BalancesByOwner;