zcash-hackworks
/
bitcore-lib-zcash
mirror of https://github.com/zcash-hackworks/bitcore-lib-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11 from braydonf/millis 

Millis
This commit is contained in:
Patrick Nagurny 2015-11-04 10:11:23 -05:00
parent d189160a73 d3a8926bd9
commit d23d53e587
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.coveralls.yml
View File

@ -1 +1 @@
repo_token: DPmQxVTui2krriKgoXsUS4ahhOAEY6Ron
repo_token: 5ki6iPbGaiwHzIwcfNDzTXoiqAcffqUQs

4
lib/unit.js
View File

@ -95,7 +95,7 @@ Unit.fromBTC = function(amount) {
* @param {Number} amount - The amount in mBTC
* @returns {Unit} A Unit instance
*/
Unit.fromMilis = function(amount) {
Unit.fromMillis = Unit.fromMilis = function(amount) {
return new Unit(amount, Unit.mBTC);
};
@ -173,7 +173,7 @@ Unit.prototype.toBTC = function() {
*
* @returns {Number} The value converted to mBTC
*/
Unit.prototype.toMilis = function() {
Unit.prototype.toMillis = Unit.prototype.toMilis = function() {
return this.to(Unit.mBTC);
};

4
test/unit.js
View File

@ -49,6 +49,9 @@ describe('Unit', function() {
unit = Unit.fromMilis('1.00001');
unit.mBTC.should.equal(1.00001);
unit = Unit.fromMillis('1.00001');
unit.mBTC.should.equal(1.00001);
unit = Unit.fromBits('100');
unit.bits.should.equal(100);
@ -136,6 +139,7 @@ describe('Unit', function() {
var unit = new Unit(1.3, 'BTC');
unit.toBTC().should.equal(unit.BTC);
unit.toMilis().should.equal(unit.mBTC);
unit.toMillis().should.equal(unit.mBTC);
unit.toBits().should.equal(unit.bits);
unit.toSatoshis().should.equal(unit.satoshis);
});