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

contract async call && transact

This commit is contained in:
Marek Kotewicz 2015-05-11 18:59:46 +02:00
parent 1272780686
commit a0b9cfb1e7
8 changed files with 83 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/web3-light.js vendored
View File

@ -2680,7 +2680,7 @@ SolidityFunction.prototype.sendTransaction = function () {
return;
}
web3.eth.call(payload, callback);
web3.eth.sendTransaction(payload, callback);
};
/**

2
dist/web3-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/web3-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/web3.js vendored
View File

@ -2680,7 +2680,7 @@ SolidityFunction.prototype.sendTransaction = function () {
return;
}
web3.eth.call(payload, callback);
web3.eth.sendTransaction(payload, callback);
};
/**

2
dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/web3/function.js
View File

@ -125,7 +125,7 @@ SolidityFunction.prototype.sendTransaction = function () {
return;
}
web3.eth.call(payload, callback);
web3.eth.sendTransaction(payload, callback);
};
/**

75
test/contract.js
View File

@ -321,6 +321,43 @@ describe('web3.eth.contract', function () {
contract.send.sendTransaction(address, 17, {from: address, gas: 50000, gasPrice: 3000, value: 10000});
});
it('should explicitly sendTransaction with optional params and call callback without error', function (done) {
var provider = new FakeHttpProvider();
web3.setProvider(provider);
web3.reset();
var sha3 = '0x5131231231231231231231';
var address = '0x1234567890123456789012345678901234567890';
provider.injectResult(sha3);
var step = 0;
provider.injectValidation(function (payload) {
if (step === 0) {
step = 1;
assert.equal(payload.jsonrpc, '2.0');
assert.equal(payload.method, 'web3_sha3');
assert.equal(payload.params[0], web3.fromAscii('send(address,uint256)'));
} else if (step === 1) {
assert.equal(payload.method, 'eth_sendTransaction');
assert.deepEqual(payload.params, [{
data: sha3.slice(0, 10) +
'0000000000000000000000001234567890123456789012345678901234567890' +
'0000000000000000000000000000000000000000000000000000000000000011' ,
to: address,
from: address,
gas: '0xc350',
gasPrice: '0xbb8',
value: '0x2710'
}]);
}
});
var contract = web3.eth.contract(desc).at(address);
contract.send.sendTransaction(address, 17, {from: address, gas: 50000, gasPrice: 3000, value: 10000}, function (err) {
assert.equal(err, null);
done();
});
});
it('should call testArr method and properly parse result', function () {
var provider = new FakeHttpProvider2();
web3.setProvider(provider);
@ -350,10 +387,46 @@ describe('web3.eth.contract', function () {
});
var contract = web3.eth.contract(desc).at(address);
var result = contract.testArr([3]);
assert.deepEqual(new BigNumber(5), result);
});
it('should call testArr method, properly parse result and return the result async', function (done) {
var provider = new FakeHttpProvider2();
web3.setProvider(provider);
web3.reset();
var sha3 = '0x5131231231231231231231';
var address = '0x1234567890123456789012345678901234567890';
provider.injectResultList([{
result: sha3
}, {
result: '0x0000000000000000000000000000000000000000000000000000000000000005'
}]);
var step = 0;
provider.injectValidation(function (payload) {
if (step === 1) { // getting sha3 is first
assert.equal(payload.method, 'eth_call');
assert.deepEqual(payload.params, [{
data: sha3.slice(0, 10) +
'0000000000000000000000000000000000000000000000000000000000000020' +
'0000000000000000000000000000000000000000000000000000000000000001' +
'0000000000000000000000000000000000000000000000000000000000000003',
to: address
},
'latest'
]);
}
step++;
});
var contract = web3.eth.contract(desc).at(address);
contract.testArr([3], function (err, result) {
assert.deepEqual(new BigNumber(5), result);
done();
});
});
});
});