Fix deployment to geth

2 files changed, 6 insertions, 7 deletions

diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinAssetProxyDispatcher.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinAssetProxyDispatcher.sol
index 643ccef81..520569185 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinAssetProxyDispatcher.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinAssetProxyDispatcher.sol
@@ -181,7 +181,7 @@ contract MixinAssetProxyDispatcher is
                     cdStart,                // write output over input
                     512                     // reserve 512 bytes for output
                 )
-                if eq(success, 0) {
+                if iszero(success) {
                     revert(cdStart, returndatasize())
                 }
             }
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts
index 8c9dc9997..08026331f 100644
--- a/packages/contracts/test/asset_proxy/proxies.ts
+++ b/packages/contracts/test/asset_proxy/proxies.ts
@@ -28,6 +28,11 @@ import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper'
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+const assetProxyInterface = new IAssetProxyContract(
+    artifacts.IAssetProxy.compilerOutput.abi,
+    constants.NULL_ADDRESS,
+    provider,
+);
 
 // tslint:disable:no-unnecessary-type-assertion
 describe('Asset Transfer Proxies', () => {
@@ -42,7 +47,6 @@ describe('Asset Transfer Proxies', () => {
     let erc721Receiver: DummyERC721ReceiverContract;
     let erc20Proxy: ERC20ProxyContract;
     let erc721Proxy: ERC721ProxyContract;
-    let assetProxyInterface: IAssetProxyContract;
 
     let erc20Wrapper: ERC20Wrapper;
     let erc721Wrapper: ERC721Wrapper;
@@ -92,11 +96,6 @@ describe('Asset Transfer Proxies', () => {
             provider,
             txDefaults,
         );
-        assetProxyInterface = await IAssetProxyContract.deployFrom0xArtifactAsync(
-            artifacts.IAssetProxy,
-            provider,
-            txDefaults,
-        );
     });
     beforeEach(async () => {
         await blockchainLifecycle.startAsync();