gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into cpp

Browse Source 
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
This commit is contained in:
Marek Kotewicz
2015-01-27 09:36:39 +01:00
parent d223ac0379 da4c2d530d
commit 1f5a6f1341
20 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/contract.js
View File

@ -53,7 +53,7 @@ var contract = function (address, desc) {
// prototype, so we make it so as a workaround.
if (method.name.indexOf('(') === -1) {
var displayName = method.name;
var typeName = method.inputs.map(function(i){return i.type}).join();
var typeName = method.inputs.map(function(i){return i.type; }).join();
method.name = displayName + '(' + typeName + ')';
}
});
@ -120,9 +120,9 @@ var contract = function (address, desc) {
var ret = outputParser[displayName][typeName](output);
if (collapse)
{
if (ret.length == 1)
if (ret.length === 1)
ret = ret[0];
else if (ret.length == 0)
else if (ret.length === 0)
ret = null;
}
return ret;