status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #491 from embark-framework/alias_address 

alias address
This commit is contained in:
RJ Catalano 2018-06-06 12:16:21 -05:00 committed by GitHub
parent 1e4838d25a a4196be958
commit 60e4f9f07d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/embark.js
View File

@ -29,6 +29,7 @@ EmbarkJS.Contract = function(options) {
ContractClass.setProvider(this.web3.currentProvider); ContractClass.setProvider(this.web3.currentProvider);
ContractClass.options.data = this.code; ContractClass.options.data = this.code;
ContractClass.abi = ContractClass.options.abi; ContractClass.abi = ContractClass.options.abi;
ContractClass.address = this.address;
return ContractClass; return ContractClass;
} else { } else {
ContractClass = this.web3.eth.contract(this.abi); ContractClass = this.web3.eth.contract(this.abi);

2
lib/tests/test.js
View File

@ -148,6 +148,7 @@ class Test {
} }
Object.assign(self.contracts[contractName], new self.web3.eth.Contract(contract.abiDefinition, contract.deployedAddress, Object.assign(self.contracts[contractName], new self.web3.eth.Contract(contract.abiDefinition, contract.deployedAddress,
{from: self.web3.eth.defaultAccount, gas: 6000000})); {from: self.web3.eth.defaultAccount, gas: 6000000}));
self.contracts[contractName].address = contract.deployedAddress;
eachCb(); eachCb();
}, next); }, next);
} }
@ -188,6 +189,7 @@ class Test {
} }
this.contracts[contractName] = new this.web3.eth.Contract(contract.abiDefinition, contract.address, this.contracts[contractName] = new this.web3.eth.Contract(contract.abiDefinition, contract.address,
{from: this.web3.eth.defaultAccount, gas: 6000000}); {from: this.web3.eth.defaultAccount, gas: 6000000});
this.contracts[contractName].address = contract.address;
return this.contracts[contractName]; return this.contracts[contractName];
} }
throw new Error(__('Unknown module %s', module)); throw new Error(__('Unknown module %s', module));

4
test_apps/test_app/test/simple_storage_spec.js
View File

@ -31,4 +31,8 @@ contract("SimpleStorage", function () {
assert.strictEqual(result, web3.eth.defaultAccount); assert.strictEqual(result, web3.eth.defaultAccount);
}); });
it("should alias contract address", async function () {
assert.strictEqual(SimpleStorage.options.address, SimpleStorage.address);
});
}); });