Merge

2018-07-18 15:37:34 +02:00
parent dad557164e
commit c71781d9ab
25 changed files with 590 additions and 401 deletions
--- a/packages/contracts/test/utils/forwarder_wrapper.ts
+++ b/packages/contracts/test/utils/forwarder_wrapper.ts
@@ -145,7 +145,7 @@ export class ForwarderWrapper {
        feeProportion: number,
        makerAssetFillAmount: BigNumber,
    ): Promise<BigNumber> {
-        const makerAssetData = assetProxyUtils.decodeAssetData(orders[0].makerAssetData);
+        const makerAssetData = assetProxyUtils.decodeAssetDataOrThrow(orders[0].makerAssetData);
        const makerAssetToken = makerAssetData.tokenAddress;
        const params = formatters.createMarketBuyOrders(orders, makerAssetFillAmount);