aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-06-30 01:02:07 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-06-30 04:33:22 +0800
commit44b6adaa2912e4c21ae93441fde410610f817b1d (patch)
tree135ea8559f35f50e023a8280784f29ac4309d153
parent762a6199b25391bde65ea2f1f91532c3c1d5badf (diff)
downloaddexon-sol-tools-44b6adaa2912e4c21ae93441fde410610f817b1d.tar
dexon-sol-tools-44b6adaa2912e4c21ae93441fde410610f817b1d.tar.gz
dexon-sol-tools-44b6adaa2912e4c21ae93441fde410610f817b1d.tar.bz2
dexon-sol-tools-44b6adaa2912e4c21ae93441fde410610f817b1d.tar.lz
dexon-sol-tools-44b6adaa2912e4c21ae93441fde410610f817b1d.tar.xz
dexon-sol-tools-44b6adaa2912e4c21ae93441fde410610f817b1d.tar.zst
dexon-sol-tools-44b6adaa2912e4c21ae93441fde410610f817b1d.zip
Fix deployment to geth
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinAssetProxyDispatcher.sol2
-rw-r--r--packages/contracts/test/asset_proxy/proxies.ts11
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();