From 4bdf52fc1e5030d53a8b7337051e12ebd0509009 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Sat, 31 Jan 2015 13:54:39 +0100
Subject: toAscii && fromAscii moved to utils
---
lib/web3.js | 38 ++++----------------------------------
1 file changed, 4 insertions(+), 34 deletions(-)
(limited to 'lib/web3.js')
diff --git a/lib/web3.js b/lib/web3.js
index 88dc6931b..c99c76421 100644
--- a/lib/web3.js
+++ b/lib/web3.js
@@ -27,6 +27,8 @@ if (process.env.NODE_ENV !== 'build') {
var BigNumber = require('bignumber.js');
}
+var utils = require('./utils');
+
var ETH_UNITS = [
'wei',
'Kwei',
@@ -192,43 +194,11 @@ var web3 = {
_events: {},
providers: {},
- toHex: function(str) {
- var hex = "";
- for(var i = 0; i < str.length; i++) {
- var n = str.charCodeAt(i).toString(16);
- hex += n.length < 2 ? '0' + n : n;
- }
-
- return hex;
- },
-
/// @returns ascii string representation of hex value prefixed with 0x
- toAscii: function(hex) {
- // Find termination
- var str = "";
- var i = 0, l = hex.length;
- if (hex.substring(0, 2) === '0x')
- i = 2;
- for(; i < l; i+=2) {
- var code = parseInt(hex.substr(i, 2), 16);
- if(code === 0) {
- break;
- }
-
- str += String.fromCharCode(code);
- }
-
- return str;
- },
+ toAscii: utils.toAscii,
/// @returns hex representation (prefixed by 0x) of ascii string
- fromAscii: function(str, pad) {
- pad = pad === undefined ? 0 : pad;
- var hex = this.toHex(str);
- while(hex.length < pad*2)
- hex += "00";
- return "0x" + hex;
- },
+ fromAscii: utils.fromAscii,
/// @returns decimal representaton of hex value prefixed by 0x
toDecimal: function (val) {
--
cgit v1.2.3