embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: revert custom `deploy()` API for `EmbarkJS.Contract` 

`.deploy()` is an alias to `.new()` and in other tools also no longer used
as API to deploy instances. In addition, we don't want it to shadow the
original web3 `deploy()` API which actually caused a breeaking change.
This commit is contained in:
Pascal Precht 2020-02-19 16:32:29 +01:00 committed by Iuri Matias
parent 0461fa01e0
commit d3200e333d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dapps/tests/app/test/simple_storage_deploy_spec.js
View File

@ -5,7 +5,18 @@ const {Utils} = artifacts.require('EmbarkJS');
contract("SimpleStorage Deploy", function () { contract("SimpleStorage Deploy", function () {
let simpleStorageInstance; let simpleStorageInstance;
before(async () => { before(async () => {
simpleStorageInstance = await SimpleStorage.deploy([150]); return new Promise(async (resolve, reject) => {
const gas = await SimpleStorage.deploy({arguments: [150]}).estimateGas();
Utils.secureSend(web3, SimpleStorage.deploy({arguments: [150]}), {gas, from: web3.eth.defaultAccount}, true, function(err, receipt) {
if(err) {
return reject(err);
}
simpleStorageInstance = SimpleStorage;
simpleStorageInstance.options.address = receipt.contractAddress;
resolve();
});
});
}); });
it("should set constructor value", async function () { it("should set constructor value", async function () {

6
packages/embarkjs/embarkjs/src/lib/blockchain.js
View File

@ -313,7 +313,7 @@ function Contract(options) {
}); });
// Assign helpers too // Assign helpers too
for(const method of ["deploy", "new", "at", "send", "deployed"]) { for(const method of ["new", "at", "send", "deployed"]) {
// Make sure we don't override original methods here. // Make sure we don't override original methods here.
if (originalMethods.includes(method)) { if (originalMethods.includes(method)) {
console.log(method + " is a reserved word and will not be aliased as a helper"); console.log(method + " is a reserved word and will not be aliased as a helper");
@ -328,7 +328,7 @@ function Contract(options) {
return ContractClass; return ContractClass;
} }
Contract.prototype.deploy = function(args, _options, _txOptions) { Contract.prototype.new = function(args, _options, _txOptions) {
const self = this; const self = this;
const options = Object.assign({ const options = Object.assign({
arguments: args || [], arguments: args || [],
@ -358,8 +358,6 @@ Contract.prototype.deploy = function(args, _options, _txOptions) {
return this._deployPromise; return this._deployPromise;
}; };
Contract.prototype.new = Contract.prototype.deploy;
Contract.prototype.at = function(address) { Contract.prototype.at = function(address) {
return new Contract({abi: this.abi, code: this.code, address: address}); return new Contract({abi: this.abi, code: this.code, address: address});
}; };