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

JS: Major fix for comparing XRP (reported by @vinniefalco).

Browse Source
This commit is contained in:
Arthur Britto
2013-04-24 18:10:36 -07:00
committed by Stefan Thomas
parent 0099b987d2
commit 3ac9e57898
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/amount.js
View File

@@ -46,7 +46,7 @@ var Amount = function () {
// integer : XRP // integer : XRP
// { 'value' : ..., 'currency' : ..., 'issuer' : ...} // { 'value' : ..., 'currency' : ..., 'issuer' : ...}
this._value = new BigInteger(); // NaN for bad value. Always positive for non-XRP. this._value = new BigInteger(); // NaN for bad value. Always positive.
this._offset = 0; // Always 0 for XRP. this._offset = 0; // Always 0 for XRP.
this._is_native = true; // Default to XRP. Only valid if value is not NaN. this._is_native = true; // Default to XRP. Only valid if value is not NaN.
this._is_negative = false; this._is_negative = false;
@@ -226,14 +226,6 @@ Amount.prototype.compareTo = function (v) {
if (!this.is_comparable(v)) { if (!this.is_comparable(v)) {
result = Amount.NaN(); result = Amount.NaN();
} }
else if (this._is_native) {
result = this._value.compareTo(v._value);
if (result > 1)
result = 1;
else if (result < -1)
result = -1;
}
else if (this._is_negative !== v._is_negative) { else if (this._is_negative !== v._is_negative) {
result = this._is_negative ? -1 : 1; result = this._is_negative ? -1 : 1;
} }
@@ -242,15 +234,15 @@ Amount.prototype.compareTo = function (v) {
? 1 ? 1
: v._value.equals(BigInteger.ZERO) : v._value.equals(BigInteger.ZERO)
? 0 ? 0
: 1; : -1;
} }
else if (v._value.equals(BigInteger.ZERO)) { else if (v._value.equals(BigInteger.ZERO)) {
result = 1; result = 1;
} }
else if (this._offset > v._offset) { else if (!this._is_native && this._offset > v._offset) {
result = this._is_negative ? -1 : 1; result = this._is_negative ? -1 : 1;
} }
else if (this._offset < v._offset) { else if (!this._is_native && this._offset < v._offset) {
result = this._is_negative ? 1 : -1; result = this._is_negative ? 1 : -1;
} }
else { else {