status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename Kwei to kwei, added support for some SI base units for ether

This commit is contained in:
Alexandre Van de Sande 2015-05-22 11:45:37 -03:00
parent ea4d66ee95
commit bacb03cc5d
3 changed files with 76 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/utils/config.js
View File

@ -38,11 +38,19 @@ var BigNumber = require('bignumber.js');
var ETH_UNITS = [ var ETH_UNITS = [
'wei', 'wei',
'Kwei', 'kwei',
'Mwei', 'Mwei',
'Gwei', 'Gwei',
'szabo', 'szabo',
'finney', 'finney',
'femtoether',
'picoether',
'nanoether',
'microether',
'miliether',
'nano',
'micro',
'mili',
'ether', 'ether',
'grand', 'grand',
'Mether', 'Mether',

38
lib/utils/utils.js
View File

@ -39,12 +39,20 @@ var unitMap = {
'wei': '1', 'wei': '1',
'kwei': '1000', 'kwei': '1000',
'ada': '1000', 'ada': '1000',
'femtoether': '1000',
'mwei': '1000000', 'mwei': '1000000',
'babbage': '1000000', 'babbage': '1000000',
'picoether': '1000000',
'gwei': '1000000000', 'gwei': '1000000000',
'shannon': '1000000000', 'shannon': '1000000000',
'nanoether': '1000000000',
'nano': '1000000000',
'szabo': '1000000000000', 'szabo': '1000000000000',
'microether': '1000000000000',
'micro': '1000000000000',
'finney': '1000000000000000', 'finney': '1000000000000000',
'miliether': '1000000000000000',
'mili': '1000000000000000',
'ether': '1000000000000000000', 'ether': '1000000000000000000',
'kether': '1000000000000000000000', 'kether': '1000000000000000000000',
'grand': '1000000000000000000000', 'grand': '1000000000000000000000',
@ -239,13 +247,14 @@ var getValueOfUnit = function (unit) {
* Takes a number of wei and converts it to any other ether unit. * Takes a number of wei and converts it to any other ether unit.
* *
* Possible units are: * Possible units are:
* - kwei/ada * SI Short SI Full Effigy Other
* - mwei/babbage * - kwei femtoether ada
* - gwei/shannon * - mwei picoether babbage
* - szabo * - gwei nanoether shannon nano
* - finney * - -- microether szabo micro
* - ether * - -- miliether finney mili
* - kether/grand/einstein * - ether -- --
* - kether einstein grand
* - mether * - mether
* - gether * - gether
* - tether * - tether
@ -265,13 +274,14 @@ var fromWei = function(number, unit) {
* Takes a number of a unit and converts it to wei. * Takes a number of a unit and converts it to wei.
* *
* Possible units are: * Possible units are:
* - kwei/ada * SI Short SI Full Effigy Other
* - mwei/babbage * - kwei femtoether ada
* - gwei/shannon * - mwei picoether babbage
* - szabo * - gwei nanoether shannon nano
* - finney * - -- microether szabo micro
* - ether * - -- miliether finney mili
* - kether/grand/einstein * - ether -- --
* - kether einstein grand
* - mether * - mether
* - gether * - gether
* - tether * - tether

8
test/utils.toWei.js
View File

@ -19,6 +19,14 @@ describe('lib/utils/utils', function () {
assert.equal(utils.toWei(1, 'gether'), '1000000000000000000000000000'); assert.equal(utils.toWei(1, 'gether'), '1000000000000000000000000000');
assert.equal(utils.toWei(1, 'tether'), '1000000000000000000000000000000'); assert.equal(utils.toWei(1, 'tether'), '1000000000000000000000000000000');
assert.equal(utils.toWei(1, 'kwei'), utils.toWei(1, 'femtoether'));
assert.equal(utils.toWei(1, 'babbage'), utils.toWei(1, 'picoether'));
assert.equal(utils.toWei(1, 'shannon'), utils.toWei(1, 'nanoether'));
assert.equal(utils.toWei(1, 'szabo'), utils.toWei(1, 'microether'));
assert.equal(utils.toWei(1, 'finney'), utils.toWei(1, 'miliether'));
assert.equal(utils.toWei(1, 'mili'), utils.toWei(1, 'miliether'));
assert.equal(utils.toWei(1, 'mili'), utils.toWei(1000, 'micro'));
assert.throws(function () {utils.toWei(1, 'wei1');}, Error); assert.throws(function () {utils.toWei(1, 'wei1');}, Error);
}); });
}); });