Add tests for recursive MAP decoding

2 files changed, 44 insertions, 3 deletions

diff --git a/packages/order-utils/test/asset_data_utils_test.ts b/packages/order-utils/test/asset_data_utils_test.ts
index 6835b6e30..d3d265b5a 100644
--- a/packages/order-utils/test/asset_data_utils_test.ts
+++ b/packages/order-utils/test/asset_data_utils_test.ts
@@ -1,6 +1,6 @@
 import * as chai from 'chai';
 
-import { AssetProxyId } from '@0x/types';
+import { AssetProxyId, ERC721AssetData } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 
 import { assetDataUtils } from '../src/asset_data_utils';
@@ -63,4 +63,45 @@ describe('assetDataUtils', () => {
         expect(decodedAssetData.amounts).to.deep.equal(KNOWN_MULTI_ASSET_ENCODING.amounts);
         expect(decodedAssetData.nestedAssetData).to.deep.equal(KNOWN_MULTI_ASSET_ENCODING.nestedAssetData);
     });
+    it('should recursively decode ERC20 and ERC721 multiAssetData', () => {
+        const decodedAssetData = assetDataUtils.decodeMultiAssetDataRecursively(KNOWN_MULTI_ASSET_ENCODING.assetData);
+        expect(decodedAssetData.assetProxyId).to.equal(AssetProxyId.MultiAsset);
+        expect(decodedAssetData.amounts).to.deep.equal(KNOWN_MULTI_ASSET_ENCODING.amounts);
+        const decodedErc20AssetData = decodedAssetData.nestedAssetData[0];
+        const decodedErc721AssetData = decodedAssetData.nestedAssetData[1] as ERC721AssetData;
+        expect(decodedErc20AssetData.tokenAddress).to.equal(KNOWN_ERC20_ENCODING.address);
+        expect(decodedErc20AssetData.assetProxyId).to.equal(AssetProxyId.ERC20);
+        expect(decodedErc721AssetData.tokenAddress).to.equal(KNOWN_ERC721_ENCODING.address);
+        expect(decodedErc721AssetData.assetProxyId).to.equal(AssetProxyId.ERC721);
+        expect(decodedErc721AssetData.tokenId).to.be.bignumber.equal(KNOWN_ERC721_ENCODING.tokenId);
+    });
+    it('should recursively decode nested assetData within multiAssetData', () => {
+        const amounts = [new BigNumber(1), new BigNumber(1), new BigNumber(2)];
+        const nestedAssetData = [
+            KNOWN_ERC20_ENCODING.assetData,
+            KNOWN_ERC721_ENCODING.assetData,
+            KNOWN_MULTI_ASSET_ENCODING.assetData,
+        ];
+        const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+        const decodedAssetData = assetDataUtils.decodeMultiAssetDataRecursively(assetData);
+        expect(decodedAssetData.assetProxyId).to.equal(AssetProxyId.MultiAsset);
+        const expectedAmounts = [new BigNumber(1), new BigNumber(1), new BigNumber(2), new BigNumber(2)];
+        expect(decodedAssetData.amounts).to.deep.equal(expectedAmounts);
+        const expectedLength = 4;
+        expect(decodedAssetData.nestedAssetData.length).to.be.equal(expectedLength);
+        const decodedErc20AssetData1 = decodedAssetData.nestedAssetData[0];
+        const decodedErc721AssetData1 = decodedAssetData.nestedAssetData[1] as ERC721AssetData;
+        const decodedErc20AssetData2 = decodedAssetData.nestedAssetData[2];
+        const decodedErc721AssetData2 = decodedAssetData.nestedAssetData[3] as ERC721AssetData;
+        expect(decodedErc20AssetData1.tokenAddress).to.equal(KNOWN_ERC20_ENCODING.address);
+        expect(decodedErc20AssetData1.assetProxyId).to.equal(AssetProxyId.ERC20);
+        expect(decodedErc721AssetData1.tokenAddress).to.equal(KNOWN_ERC721_ENCODING.address);
+        expect(decodedErc721AssetData1.assetProxyId).to.equal(AssetProxyId.ERC721);
+        expect(decodedErc721AssetData1.tokenId).to.be.bignumber.equal(KNOWN_ERC721_ENCODING.tokenId);
+        expect(decodedErc20AssetData2.tokenAddress).to.equal(KNOWN_ERC20_ENCODING.address);
+        expect(decodedErc20AssetData2.assetProxyId).to.equal(AssetProxyId.ERC20);
+        expect(decodedErc721AssetData2.tokenAddress).to.equal(KNOWN_ERC721_ENCODING.address);
+        expect(decodedErc721AssetData2.assetProxyId).to.equal(AssetProxyId.ERC721);
+        expect(decodedErc721AssetData2.tokenId).to.be.bignumber.equal(KNOWN_ERC721_ENCODING.tokenId);
+    });
 });
diff --git a/packages/order-utils/test/utils/test_order_factory.ts b/packages/order-utils/test/utils/test_order_factory.ts
index 145332674..4efe0b38e 100644
--- a/packages/order-utils/test/utils/test_order_factory.ts
+++ b/packages/order-utils/test/utils/test_order_factory.ts
@@ -7,9 +7,9 @@ import { orderFactory } from '../../src/order_factory';
 const BASE_TEST_ORDER: Order = orderFactory.createOrder(
     constants.NULL_ADDRESS,
     constants.ZERO_AMOUNT,
-    constants.NULL_ADDRESS,
+    constants.NULL_ERC20_ASSET_DATA,
     constants.ZERO_AMOUNT,
-    constants.NULL_ADDRESS,
+    constants.NULL_ERC20_ASSET_DATA,
     constants.NULL_ADDRESS,
 );
 const BASE_TEST_SIGNED_ORDER: SignedOrder = {