removed unused formatOutputHash, renamed formatXXXString to formatXXX…

…Bytes
web3 · Apr 22, 2015 · f767a9a · f767a9a
1 parent 888a970
commit f767a9a
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 71 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/solidity/coder.js b/lib/solidity/coder.js
@@ -299,8 +299,8 @@ var coder = new SolidityCoder([
         name: 'bytes',
         match: 'prefix',
         mode: 'bytes',
-        inputFormatter: f.formatInputString,
-        outputFormatter: f.formatOutputString
+        inputFormatter: f.formatInputBytes,
+        outputFormatter: f.formatOutputBytes
     }),
     new SolidityType({
         name: 'real',

diff --git a/lib/solidity/formatters.js b/lib/solidity/formatters.js
@@ -45,11 +45,11 @@ var formatInputInt = function (value) {
 /**
  * Formats input value to byte representation of string
  *
- * @method formatInputString
+ * @method formatInputBytes
  * @param {String}
  * @returns {SolidityParam}
  */
-var formatInputString = function (value) {
+var formatInputBytes = function (value) {
     var result = utils.fromAscii(value, c.ETH_PADDING).substr(2);
     return new SolidityParam('', formatInputInt(value.length).value, result);
 };
@@ -141,17 +141,6 @@ var formatOutputUReal = function (param) {
     return formatOutputUInt(param).dividedBy(new BigNumber(2).pow(128)); 
 };
 
-/**
- * Should be used to format output hash
- *
- * @method formatOutputHash
- * @param {SolidityParam}
- * @returns {String} right-aligned output bytes formatted to hex
- */
-var formatOutputHash = function (param) {
-    return "0x" + param.value;
-};
-
 /**
  * Should be used to format output bool
  *
@@ -166,11 +155,11 @@ var formatOutputBool = function (param) {
 /**
  * Should be used to format output string
  *
- * @method formatOutputString
+ * @method formatOutputBytes
  * @param {SolidityParam} left-aligned hex representation of string
  * @returns {String} ascii string
  */
-var formatOutputString = function (param) {
+var formatOutputBytes = function (param) {
     // length might also be important!
     return utils.toAscii(param.suffix);
 };
@@ -189,16 +178,15 @@ var formatOutputAddress = function (param) {
 
 module.exports = {
     formatInputInt: formatInputInt,
-    formatInputString: formatInputString,
+    formatInputBytes: formatInputBytes,
     formatInputBool: formatInputBool,
     formatInputReal: formatInputReal,
     formatOutputInt: formatOutputInt,
     formatOutputUInt: formatOutputUInt,
     formatOutputReal: formatOutputReal,
     formatOutputUReal: formatOutputUReal,
-    formatOutputHash: formatOutputHash,
     formatOutputBool: formatOutputBool,
-    formatOutputString: formatOutputString,
+    formatOutputBytes: formatOutputBytes,
     formatOutputAddress: formatOutputAddress
 };