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

Fix IOU value passed to Amount.from_json()

Browse Source
This commit is contained in:
wltsmrz
2015-02-09 13:41:40 -08:00
parent ff86d5381d
commit fd1b64393d
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/ripple/orderbook.js
View File

@@ -439,19 +439,22 @@ OrderBook.prototype.setFundedAmount = function(offer, fundedAmount) {
return offer; return offer;
} }
var isOfferGetsExceeded = Amount.from_json(fundedAmount) var isOfferGetsExceeded = Amount.from_json(
this._currencyGets.is_native()
? fundedAmount
: fundedAmount + OrderBook.IOU_SUFFIX
)
.compareTo(offer.TakerGets) > 0; .compareTo(offer.TakerGets) > 0;
if (isOfferGetsExceeded) { if (isOfferGetsExceeded) {
offer.taker_gets_funded = offer.TakerGets; offer.taker_gets_funded = Amount.from_json(offer.TakerGets).to_text();
} else { } else {
offer.taker_gets_funded = fundedAmount; offer.taker_gets_funded = fundedAmount;
} }
var takerPaysValue = (typeof offer.TakerPays === 'object') var takerPaysValue = this._currencyPays.is_native()
? offer.TakerPays.value ? offer.TakerPays
: offer.TakerPays; : offer.TakerPays.value;
var takerPays = Amount.from_json(takerPaysValue + OrderBook.IOU_SUFFIX); var takerPays = Amount.from_json(takerPaysValue + OrderBook.IOU_SUFFIX);
var takerGets = Amount.from_json(offerSum); var takerGets = Amount.from_json(offerSum);
var fundedPays = Amount.from_json(fundedAmount + OrderBook.IOU_SUFFIX); var fundedPays = Amount.from_json(fundedAmount + OrderBook.IOU_SUFFIX);

6
test/orderbook-test.js
View File

@@ -1594,6 +1594,7 @@ describe('OrderBook', function() {
taker_gets_funded: '0.2', taker_gets_funded: '0.2',
taker_pays_funded: '99.72233516476456' taker_pays_funded: '99.72233516476456'
}, },
{ Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y', { Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414', BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
BookNode: '0000000000000000', BookNode: '0000000000000000',
@@ -1614,8 +1615,9 @@ describe('OrderBook', function() {
index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86', index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
owner_funds: '0.950363009783092', owner_funds: '0.950363009783092',
is_fully_funded: false, is_fully_funded: false,
taker_gets_funded: '0.9484660776278363', taker_gets_funded: '0.5',
taker_pays_funded: '94.58325208561269' }, taker_pays_funded: '94.58325208561269' },
{ Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y', { Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414', BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
BookNode: '0000000000000000', BookNode: '0000000000000000',
@@ -1637,7 +1639,7 @@ describe('OrderBook', function() {
index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86', index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
owner_funds: '0.950363009783092', owner_funds: '0.950363009783092',
is_fully_funded: false, is_fully_funded: false,
taker_gets_funded: '0.9484660776278363', taker_gets_funded: '0.5',
taker_pays_funded: '94.58325208561269' taker_pays_funded: '94.58325208561269'
} }
] ]