ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

JS: Fix request_ripple_balance.

Browse Source
This commit is contained in:
Arthur Britto
2012-10-18 20:00:36 -07:00
parent 81cbbc2642
commit fd1122c673
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/remote.js
View File

@@ -701,19 +701,22 @@ Remote.prototype.dirty_account_root = function (account) {
// --> current: bool : true = current ledger // --> current: bool : true = current ledger
Remote.prototype.request_ripple_balance = function (account, issuer, currency, current) { Remote.prototype.request_ripple_balance = function (account, issuer, currency, current) {
var account_u = UInt160.from_json(account); var account_u = UInt160.from_json(account);
var request = this.request_ledger_entry('ripple_state'); // YYY Could be cached per ledger.
return (this.request_ledger_entry('ripple_state')) // YYY Could be cached per ledger. return request
.ripple_state(account, issuer, currency) .ripple_state(account, issuer, currency)
.ledger_choose(current) .ledger_choose(current)
.on('success', function (message) { .on('success', function (message) {
var node = message.node; var node = message.node;
var flip = account_u == node.HighLimit.issuer; var lowLimit = Amount.from_json(node.LowLimit);
var issuerLimit = flip ? node.LowLimit : node.HighLimit; var highLimit = Amount.from_json(node.HighLimit);
var accountLimit = flip ? node.HighLimit : node.LowLimit; var balance = Amount.from_json(node.Balance);
var issuerBalance = (flip ? node.Balance.clone().negate() : node.Balance.clone()).parse_issuer(issuer); var flip = account_u == highLimit.issuer;
var issuerLimit = flip ? lowLimit : highLimit;
var accountLimit = flip ? highLimit : lowLimit;
var issuerBalance = (flip ? balance.negate() : balance).parse_issuer(issuer);
var accountBalance = issuerBalance.clone().parse_issuer(issuer); var accountBalance = issuerBalance.clone().parse_issuer(issuer);
// If the caller also waits for 'success', they might run before this.
request.emit('ripple_state', { request.emit('ripple_state', {
'issuer_balance' : issuerBalance, // Balance with dst as issuer. 'issuer_balance' : issuerBalance, // Balance with dst as issuer.
'account_balance' : accountBalance, // Balance with account as issuer. 'account_balance' : accountBalance, // Balance with account as issuer.

1
test/remote-test.js
View File

@@ -103,6 +103,7 @@ buster.testCase("Remote functions", {
.request(); .request();
}, },
// XXX This should be detected locally.
'account_root remote malformedAddress' : 'account_root remote malformedAddress' :
function (done) { function (done) {
alpha.request_ledger_closed().on('success', function (r) { alpha.request_ledger_closed().on('success', function (r) {