Add constraint conditions and increase the readability (#1418)

web3 · Mar 13, 2018 · 4239c62 · 4239c62
1 parent 8167111
commit 4239c62
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/lib/utils/utils.js b/lib/utils/utils.js
@@ -205,15 +205,22 @@ var transformToFullName = function (json) {
  * @returns {String} display name for function/event eg. multiply(uint256) -> multiply
  */
 var extractDisplayName = function (name) {
- var length = name.indexOf('(');
- return length !== -1 ? name.substr(0, length) : name;
+ var stBracket = name.indexOf('(');
+ var endBracket = name.indexOf(')');
+ return (stBracket !== -1 && endBracket !== -1) ? name.substr(0, stBracket) : name;
 };
 
-/// @returns overloaded part of function/event name
+/**
+ * Should be called to get type name of contract function
+ *
+ * @method extractTypeName
+ * @param {String} name of function/event
+ * @returns {String} type name for function/event eg. multiply(uint256) -> uint256
+ */
 var extractTypeName = function (name) {
- /// TODO: make it invulnerable
- var length = name.indexOf('(');
- return length !== -1 ? name.substr(length + 1, name.length - 1 - (length + 1)).replace(' ', '') : "";
+ var stBracket = name.indexOf('(');
+ var endBracket = name.indexOf(')');
+ return (stBracket !== -1 && endBracket !== -1) ? name.substr(stBracket + 1, endBracket - stBracket - 1).replace(' ', '') : "";
 };
 
 /**