poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix string outputs. 

Auto collapse for < 2 returns.
This commit is contained in:
Gav Wood 2015-01-24 18:23:39 -08:00
parent fb34c6c7b9
commit 113a3809ab
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dist/ethereum.js vendored
View File

@ -252,7 +252,7 @@ var formatOutputAddress = function (value) {
};
var dynamicBytesLength = function (type) {
if (arrayType(type) || prefixedType('string')(type))
if (arrayType(type) || type == 'string') // only string itself that is dynamic; stringX is static length.
return ETH_PADDING * 2;
return 0;
};
@ -501,6 +501,7 @@ var contract = function (address, desc) {
options.data = signature + parsed;
var isTransact = result._isTransact === true || (result._isTransact !== false && !method.constant);
var collapse = options.collapse !== false;
// reset
result._options = {};
@ -518,7 +519,15 @@ var contract = function (address, desc) {
}
var output = web3.eth.call(options);
return outputParser[displayName][typeName](output);
var ret = outputParser[displayName][typeName](output);
if (collapse)
{
if (ret.length == 1)
ret = ret[0];
else if (ret.length == 0)
ret = null;
}
return ret;
};
if (result[displayName] === undefined) {

6
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/abi.js
View File

@ -251,7 +251,7 @@ var formatOutputAddress = function (value) {
};
var dynamicBytesLength = function (type) {
if (arrayType(type) || prefixedType('string')(type))
if (arrayType(type) || type == 'string') // only string itself that is dynamic; stringX is static length.
return ETH_PADDING * 2;
return 0;
};

11
lib/contract.js
View File

@ -90,6 +90,7 @@ var contract = function (address, desc) {
options.data = signature + parsed;
var isTransact = result._isTransact === true || (result._isTransact !== false && !method.constant);
var collapse = options.collapse !== false;
// reset
result._options = {};
@ -107,7 +108,15 @@ var contract = function (address, desc) {
}
var output = web3.eth.call(options);
return outputParser[displayName][typeName](output);
var ret = outputParser[displayName][typeName](output);
if (collapse)
{
if (ret.length == 1)
ret = ret[0];
else if (ret.length == 0)
ret = null;
}
return ret;
};
if (result[displayName] === undefined) {