From 7809cad6cb6224e4248e89fe4a3e3aa68f2f950d Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Sun, 26 May 2019 17:59:53 -0700
Subject: [PATCH] Fix linting errors and warnings

---
 contracts/asset-proxy/contracts/src/ERC1155Proxy.sol      | 1 +
 contracts/asset-proxy/contracts/src/libs/LibAssetData.sol | 2 ++
 contracts/extensions/contracts/src/DevUtils/DevUtils.sol  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/contracts/asset-proxy/contracts/src/ERC1155Proxy.sol b/contracts/asset-proxy/contracts/src/ERC1155Proxy.sol
index 4a80754532..43fa0800ea 100644
--- a/contracts/asset-proxy/contracts/src/ERC1155Proxy.sol
+++ b/contracts/asset-proxy/contracts/src/ERC1155Proxy.sol
@@ -28,6 +28,7 @@ contract ERC1155Proxy is
     // Id of this proxy.
     bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC1155Assets(address,uint256[],uint256[],bytes)"));
 
+    // solhint-disable-next-line payable-fallback
     function () 
         external
     {
diff --git a/contracts/asset-proxy/contracts/src/libs/LibAssetData.sol b/contracts/asset-proxy/contracts/src/libs/LibAssetData.sol
index f4b22e9923..1f82c55af3 100644
--- a/contracts/asset-proxy/contracts/src/libs/LibAssetData.sol
+++ b/contracts/asset-proxy/contracts/src/libs/LibAssetData.sol
@@ -448,10 +448,12 @@ contract LibAssetData is
             "WRONG_PROXY_ID"
         );
 
+        // solhint-disable indent
         (amounts, nestedAssetData) = abi.decode(
             assetData.slice(4, assetData.length),
             (uint256[], bytes[])
         );
+        // solhint-enable indent
     }
 
     /// @dev Calls `token.ownerOf(tokenId)`, but returns a null owner instead of reverting on an unowned token.
diff --git a/contracts/extensions/contracts/src/DevUtils/DevUtils.sol b/contracts/extensions/contracts/src/DevUtils/DevUtils.sol
index b60e217740..b3827051b5 100644
--- a/contracts/extensions/contracts/src/DevUtils/DevUtils.sol
+++ b/contracts/extensions/contracts/src/DevUtils/DevUtils.sol
@@ -23,6 +23,7 @@ import "./OrderValidationUtils.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibTransactionDecoder.sol";
 
 
+// solhint-disable no-empty-blocks
 contract DevUtils is
     OrderValidationUtils,
     LibTransactionDecoder