Fix deployment to geth

This commit is contained in:
Amir Bandeali
2018-06-29 10:02:07 -07:00
parent 762a6199b2
commit 44b6adaa29
2 changed files with 6 additions and 7 deletions

View File

@@ -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())
}
}

View File

@@ -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();