ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-12-01 09:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix taker_gets_funded exceeding offer.TakerGets

Browse Source
This commit is contained in:
wltsmrz
2015-02-03 14:50:33 -08:00
parent ba9af55aca
commit b19ecb4482
3 changed files with 695 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -25,11 +25,13 @@
"superagent": "^0.18.0" "superagent": "^0.18.0"
}, },
"devDependencies": { "devDependencies": {
"assert-diff": "0.0.4",
"coveralls": "~2.10.0", "coveralls": "~2.10.0",
"gulp": "~3.6.2", "gulp": "~3.6.2",
"gulp-bump": "~0.1.10", "gulp-bump": "~0.1.10",
"gulp-clean-dest": "^0.1.0", "gulp-clean-dest": "^0.1.0",
"gulp-concat": "~2.2.0", "gulp-concat": "~2.2.0",
"gulp-eslint": "^0.2.0",
"gulp-filelog": "^0.4.1", "gulp-filelog": "^0.4.1",
"gulp-flowtype": "^0.4.1", "gulp-flowtype": "^0.4.1",
"gulp-plumber": "^0.6.6", "gulp-plumber": "^0.6.6",
@@ -38,7 +40,6 @@
"gulp-uglify": "~0.3.0", "gulp-uglify": "~0.3.0",
"gulp-util": "^3.0.2", "gulp-util": "^3.0.2",
"gulp-watch": "^3.0.0", "gulp-watch": "^3.0.0",
"gulp-eslint": "^0.2.0",
"istanbul": "~0.2.10", "istanbul": "~0.2.10",
"map-stream": "~0.1.0", "map-stream": "~0.1.0",
"mocha": "~1.14.0", "mocha": "~1.14.0",

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

@@ -439,7 +439,14 @@ OrderBook.prototype.setFundedAmount = function(offer, fundedAmount) {
return offer; return offer;
} }
var isOfferGetsExceeded = Amount.from_json(fundedAmount)
.compareTo(offer.TakerGets) > 0;
if (isOfferGetsExceeded) {
offer.taker_gets_funded = offer.TakerGets;
} else {
offer.taker_gets_funded = fundedAmount; offer.taker_gets_funded = fundedAmount;
}
var takerPaysValue = (typeof offer.TakerPays === 'object') var takerPaysValue = (typeof offer.TakerPays === 'object')
? offer.TakerPays.value ? offer.TakerPays.value

6
test/orderbook-test.js
View File

@@ -1,4 +1,4 @@
var assert = require('assert'); var assert = require('assert-diff');
var Remote = require('ripple-lib').Remote; var Remote = require('ripple-lib').Remote;
var Currency = require('ripple-lib').Currency; var Currency = require('ripple-lib').Currency;
var Amount = require('ripple-lib').Amount; var Amount = require('ripple-lib').Amount;
@@ -1791,7 +1791,7 @@ describe('OrderBook', function() {
index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86', index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
owner_funds: '3900', owner_funds: '3900',
is_fully_funded: false, is_fully_funded: false,
taker_gets_funded: '3900', taker_gets_funded: '2000',
taker_pays_funded: '97.22927678564545' taker_pays_funded: '97.22927678564545'
}, },
{ {
@@ -1811,7 +1811,7 @@ describe('OrderBook', function() {
}, },
index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86', index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
is_fully_funded: false, is_fully_funded: false,
taker_gets_funded: '3900', taker_gets_funded: '2000',
taker_pays_funded: '97.22927678564545' taker_pays_funded: '97.22927678564545'
} }
] ]