ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-20 12:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] confusion between precision and min_precision

Browse Source 
`precision` expresses precision within the provided value and won't expand it if the max expression of the value is smaller
`min_precision` will expand the value if the max expression of the value is smaller
This commit is contained in:
Geert Weening
2014-10-23 17:59:53 -07:00
parent 0527b8c981
commit 7708c64576
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/ripple/amount.js
View File

@@ -1120,11 +1120,12 @@ Amount.prototype.to_human = function(opts) {
} }
fraction_part = ''; fraction_part = '';
} else { } else {
fraction_part = Math.round(fraction_part / Math.pow(10, fraction_part.length - opts.precision)).toString(); var precision = Math.min(opts.precision, fraction_part.length);
fraction_part = Math.round(fraction_part / Math.pow(10, fraction_part.length - precision)).toString();
// because the division above will cut off the leading 0's we have to add them back again // because the division above will cut off the leading 0's we have to add them back again
// XXX look for a more elegant alternative // XXX look for a more elegant alternative
while (fraction_part.length < opts.precision) { while (fraction_part.length < precision) {
fraction_part = '0' + fraction_part; fraction_part = '0' + fraction_part;
} }
} }

23
test/amount-test.js
View File

@@ -69,7 +69,13 @@ describe('Amount', function() {
assert.strictEqual(Amount.from_human("0.00012345 XAU").to_human({precision:6}), '0.000123'); assert.strictEqual(Amount.from_human("0.00012345 XAU").to_human({precision:6}), '0.000123');
}); });
it('to human, precision 16', function() { it('to human, precision 16', function() {
assert.strictEqual(Amount.from_human("0.00012345 XAU").to_human({precision:16}), '0.0001234500000000'); assert.strictEqual(Amount.from_human("0.00012345 XAU").to_human({precision:16}), '0.00012345');
});
it('to human, precision 16, min_precision 16', function() {
assert.strictEqual(Amount.from_human("0.00012345 XAU").to_human({precision:16, min_precision:16}), '0.0001234500000000');
});
it('to human, precision 16, min_precision 12', function() {
assert.strictEqual(Amount.from_human("0.00012345 XAU").to_human({precision:16, min_precision:12}), '0.000123450000');
}); });
it('to human, precision 0, first decimal 4', function() { it('to human, precision 0, first decimal 4', function() {
assert.strictEqual(Amount.from_human("0.4 XAU").to_human({precision:0}), '0'); assert.strictEqual(Amount.from_human("0.4 XAU").to_human({precision:0}), '0');
@@ -80,6 +86,21 @@ describe('Amount', function() {
it('to human, precision 0, first decimal 8', function() { it('to human, precision 0, first decimal 8', function() {
assert.strictEqual(Amount.from_human("0.8 XAU").to_human({precision:0}), '1'); assert.strictEqual(Amount.from_human("0.8 XAU").to_human({precision:0}), '1');
}); });
it('to human, precision 0, precision 16', function() {
assert.strictEqual(Amount.from_human("0.0 XAU").to_human({precision:16}), '0.0');
});
it('to human, precision 0, precision 8, min_precision 16', function() {
assert.strictEqual(Amount.from_human("0.0 XAU").to_human({precision:8, min_precision:16}), '0.0000000000000000');
});
it('to human, precision 0, first decimal 8', function() {
assert.strictEqual(Amount.from_human("0.8 XAU").to_human({precision:0}), '1');
});
it('to human, precision 6, min_precision 6, max_sig_digits 20', function() {
assert.strictEqual(Amount.from_human("0.0 XAU").to_human({precision: 6, min_precision: 6, max_sig_digits: 20}), '0.000000');
});
it('to human, precision 16, min_precision 6, max_sig_digits 20', function() {
assert.strictEqual(Amount.from_human("0.0 XAU").to_human({precision: 16, min_precision: 6, max_sig_digits: 20}), '0.000000');
});
}); });
describe('from_human', function() { describe('from_human', function() {
it('1 XRP', function() { it('1 XRP', function() {