diff options
author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-27 16:36:39 +0800 |
---|---|---|
committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-27 16:36:39 +0800 |
commit | 1f5a6f13419415b4c05519e126eedcdf815aff7c (patch) | |
tree | de2d9551d3746ab3e4c8c38501ae0a1b6eac09d5 /lib/contract.js | |
parent | d223ac0379c4c1f8c209e777ec9ed63384590157 (diff) | |
parent | da4c2d530d6f9b8ba54221c6812f77766a33fed6 (diff) | |
download | go-tangerine-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar go-tangerine-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.gz go-tangerine-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.bz2 go-tangerine-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.lz go-tangerine-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.xz go-tangerine-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.zst go-tangerine-1f5a6f13419415b4c05519e126eedcdf815aff7c.zip |
Merge branch 'develop' into cpp
Conflicts:
dist/ethereum.js.map
dist/ethereum.min.js
Diffstat (limited to 'lib/contract.js')
-rw-r--r-- | lib/contract.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/contract.js b/lib/contract.js index 95cc7bbd6..efee00cd1 100644 --- a/lib/contract.js +++ b/lib/contract.js @@ -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; |