From 3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Tue, 17 Jul 2018 11:51:18 -0700
Subject: Use transferFrom instead of safeTransferFrom

---
 packages/contracts/src/2.0.0/forwarder/MixinAssets.sol | 7 ++-----
 packages/contracts/test/forwarder/forwarder.ts         | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'packages/contracts')

diff --git a/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol b/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol
index cd150764e..44809ed85 100644
--- a/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol
+++ b/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol
@@ -163,15 +163,12 @@ contract MixinAssets is
         // Decode asset data.
         address token = assetData.readAddress(16);
         uint256 tokenId = assetData.readUint256(36);
-        bytes memory receiverData = assetData.readBytesWithLength(100);
 
         // Perform transfer.
-        // TODO: Do we want to use `transferFrom` here?
-        IERC721Token(token).safeTransferFrom(
+        IERC721Token(token).transferFrom(
             address(this),
             msg.sender,
-            tokenId,
-            receiverData
+            tokenId
         );
     }
 }
diff --git a/packages/contracts/test/forwarder/forwarder.ts b/packages/contracts/test/forwarder/forwarder.ts
index f2966fe75..7b110b61f 100644
--- a/packages/contracts/test/forwarder/forwarder.ts
+++ b/packages/contracts/test/forwarder/forwarder.ts
@@ -18,7 +18,6 @@ import { constants } from '../utils/constants';
 import { ERC20Wrapper } from '../utils/erc20_wrapper';
 import { ERC721Wrapper } from '../utils/erc721_wrapper';
 import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { formatters } from '../utils/formatters';
 import { ForwarderWrapper } from '../utils/forwarder_wrapper';
 import { OrderFactory } from '../utils/order_factory';
 import { ContractName, ERC20BalancesByOwner } from '../utils/types';
-- 
cgit v1.2.3