diff --git a/src/api/common/schemas/get-balance-sheet.json b/src/api/common/schemas/get-balance-sheet.json index bca25cfb..5e3a9a21 100644 --- a/src/api/common/schemas/get-balance-sheet.json +++ b/src/api/common/schemas/get-balance-sheet.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "get-balance-sheet", + "title": "getBalanceSheet", "description": "getBalanceSheet response", "type": "object", "properties": { @@ -8,17 +8,17 @@ "type": "array", "items": { "type": "object", + "required": ["counterparty", "balances"], + "additionalProperties": false, "properties": { - "required": ["counterparty", "balances"], - "additionalProperties": false, "counterparty": {"$ref": "address"}, "balances": { "type": "array", "items": { "type": "object", + "required": ["currency", "value"], + "additionalProperties": false, "properties": { - "required": ["currency", "value"], - "additionalProperties": false, "currency": {"$ref": "currency"}, "value": {"$ref": "value"} } @@ -31,17 +31,17 @@ "type": "array", "items": { "type": "object", + "required": ["counterparty", "assets"], + "additionalProperties": false, "properties": { - "required": ["counterparty", "assets"], - "additionalProperties": false, "counterparty": {"$ref": "address"}, "assets": { "type": "array", "items": { "type": "object", + "required": ["currency", "value"], + "additionalProperties": false, "properties": { - "required": ["currency", "value"], - "additionalProperties": false, "currency": {"$ref": "currency"}, "value": {"$ref": "value"} } @@ -54,9 +54,9 @@ "type": "array", "items": { "type": "object", + "required": ["currency", "value"], + "additionalProperties": false, "properties": { - "required": ["currency", "value"], - "additionalProperties": false, "currency": {"$ref": "currency"}, "value": {"$ref": "value"} } diff --git a/src/api/ledger/balance-sheet.js b/src/api/ledger/balance-sheet.js index 626c71ef..8709dec3 100644 --- a/src/api/ledger/balance-sheet.js +++ b/src/api/ledger/balance-sheet.js @@ -10,25 +10,16 @@ function formatBalanceSheet({balances, obligations, assets}) { const result = {}; if (!_.isUndefined(balances)) { - result.balances = Object.keys(balances).map((k) => { - return { - counterparty: k, - balances: balances[k] - }; - }); + result.balances = _.map(balances, (balances, counterparty) => + ({counterparty, balances})); } if (!_.isUndefined(assets)) { - result.assets = Object.keys(assets).map((k) => { - return { - counterparty: k, - assets: assets[k] - }; - }); + result.assets = _.map(assets, (assets, counterparty) => + ({counterparty, assets})); } if (!_.isUndefined(obligations)) { - result.obligations = Object.keys(obligations).map((k) => { - return {currency: k, value: obligations[k]}; - }); + result.obligations = _.map(obligations, (value, currency) => + ({currency, value})); } return result; diff --git a/test/api-test.js b/test/api-test.js index d14ebd36..53fc4370 100644 --- a/test/api-test.js +++ b/test/api-test.js @@ -203,7 +203,7 @@ describe('RippleAPI', function() { it('getBalanceSheet', function() { return this.api.getBalanceSheet(address).then( - _.partial(checkResult, responses.getBalanceSheet, undefined)); + _.partial(checkResult, responses.getBalanceSheet, 'getBalanceSheet')); }); describe('getTransaction', () => {