ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

JS: Fixes for currency comparison.

Browse Source
This commit is contained in:
Arthur Britto
2012-11-17 17:31:25 -08:00
parent f953a48305
commit 5e264d2255
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/js/amount.js
View File

@@ -217,6 +217,7 @@ UInt160.prototype.to_json = function () {
return output; return output;
}; };
// XXX Internal form should be UInt160.
var Currency = function () { var Currency = function () {
// Internal form: 0 = XRP. 3 letter-code. // Internal form: 0 = XRP. 3 letter-code.
// XXX Internal should be 0 or hex with three letter annotation when valid. // XXX Internal should be 0 or hex with three letter annotation when valid.
@@ -251,6 +252,11 @@ Currency.prototype.copyTo = function(d) {
return d; return d;
}; };
Currency.prototype.equals = function(d) {
return ('string' !== typeof this._value && isNaN(this._value))
|| ('string' !== typeof d._value && isNaN(d._value)) ? false : this._value === d._value;
}
// this._value = NaN on error. // this._value = NaN on error.
Currency.prototype.parse_json = function(j) { Currency.prototype.parse_json = function(j) {
if ("" === j || "0" === j || "XRP" === j) { if ("" === j || "0" === j || "XRP" === j) {
@@ -591,6 +597,7 @@ Amount.prototype.parse_issuer = function (issuer) {
}; };
// Check BigInteger NaN // Check BigInteger NaN
// Checks currency, does not check issuer.
Amount.prototype.equals = function (d) { Amount.prototype.equals = function (d) {
return 'string' === typeof (d) return 'string' === typeof (d)
? this.equals(Amount.from_json(d)) ? this.equals(Amount.from_json(d))
@@ -599,9 +606,35 @@ Amount.prototype.equals = function (d) {
&& this._is_native === d._is_native && this._is_native === d._is_native
&& (this._is_native && (this._is_native
? this._value.equals(d._value) ? this._value.equals(d._value)
: this._is_negative === d._is_negative : this._currency.equals(d._currency)
? this._is_negative === d._is_negative
? this._value.equals(d._value) ? this._value.equals(d._value)
: this._value.equals(BigInteger.ZERO) && d._value.equals(BigInteger.ZERO))); : this._value.equals(BigInteger.ZERO) && d._value.equals(BigInteger.ZERO)
: false));
};
Amount.prototype.not_equals_why = function (d) {
return 'string' === typeof (d)
? this.not_equals_why(Amount.from_json(d))
: this === d
? false
: d.constructor === Amount
? this._is_native === d._is_native
? this._is_native
? this._value.equals(d._value)
? false
: "XRP value differs."
: this._currency.equals(d._currency)
? this._is_negative === d._is_negative
? this._value.equals(d._value)
? false
: this._value.equals(BigInteger.ZERO) && d._value.equals(BigInteger.ZERO)
? false
: "Non-XRP value differs."
: "Non-XRP sign differs."
: "Non-XRP currency differs (" + JSON.stringify(this._currency) + "/" + JSON.stringify(d._currency) + ")"
: "Native mismatch"
: "Wrong constructor."
}; };
exports.Amount = Amount; exports.Amount = Amount;