From 842363200b3b8aded3b03fc8e46a329ff9534e36 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Fri, 25 May 2018 00:31:03 -0700
Subject: Tons of tests around nested byte arrays and ERC721 receiver

---
 packages/contracts/test/asset_proxy/decoder.ts | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'packages/contracts/test/asset_proxy/decoder.ts')

diff --git a/packages/contracts/test/asset_proxy/decoder.ts b/packages/contracts/test/asset_proxy/decoder.ts
index 4416334d1..0f1413ff1 100644
--- a/packages/contracts/test/asset_proxy/decoder.ts
+++ b/packages/contracts/test/asset_proxy/decoder.ts
@@ -56,21 +56,45 @@ describe('LibAssetProxyDecoder', () => {
             expect(decodedTokenAddress).to.be.equal(expectedDecodedProxyData.tokenAddress);
         });
 
-        it('should correctly decode ERC721 proxy data)', async () => {
+        it('should correctly decode ERC721 proxy data', async () => {
             const tokenId = ZeroEx.generatePseudoRandomSalt();
             const encodedProxyData = assetProxyUtils.encodeERC721ProxyData(testAddress, tokenId);
             const expectedDecodedProxyData = assetProxyUtils.decodeERC721ProxyData(encodedProxyData);
             let decodedAssetProxyId: number;
             let decodedTokenAddress: string;
             let decodedTokenId: BigNumber;
+            let decodedData: string;
             [
                 decodedAssetProxyId,
                 decodedTokenAddress,
                 decodedTokenId,
+                decodedData,
             ] = await testAssetProxyDecoder.publicDecodeERC721Data.callAsync(encodedProxyData);
             expect(decodedAssetProxyId).to.be.equal(expectedDecodedProxyData.assetProxyId);
             expect(decodedTokenAddress).to.be.equal(expectedDecodedProxyData.tokenAddress);
             expect(decodedTokenId).to.be.bignumber.equal(expectedDecodedProxyData.tokenId);
+            expect(decodedData).to.be.equal(expectedDecodedProxyData.data);
+        });
+
+        it('should correctly decode ERC721 proxy data with receiver data', async () => {
+            const tokenId = ZeroEx.generatePseudoRandomSalt();
+            const data = ethUtil.bufferToHex(assetProxyUtils.encodeUint256(ZeroEx.generatePseudoRandomSalt())) + 'FFFF';
+            const encodedProxyData = assetProxyUtils.encodeERC721ProxyData(testAddress, tokenId, data);
+            const expectedDecodedProxyData = assetProxyUtils.decodeERC721ProxyData(encodedProxyData);
+            let decodedAssetProxyId: number;
+            let decodedTokenAddress: string;
+            let decodedTokenId: BigNumber;
+            let decodedData: string;
+            [
+                decodedAssetProxyId,
+                decodedTokenAddress,
+                decodedTokenId,
+                decodedData,
+            ] = await testAssetProxyDecoder.publicDecodeERC721Data.callAsync(encodedProxyData);
+            expect(decodedAssetProxyId).to.be.equal(expectedDecodedProxyData.assetProxyId);
+            expect(decodedTokenAddress).to.be.equal(expectedDecodedProxyData.tokenAddress);
+            expect(decodedTokenId).to.be.bignumber.equal(expectedDecodedProxyData.tokenId);
+            expect(decodedData).to.be.equal(expectedDecodedProxyData.data);
         });
     });
 });
-- 
cgit