Update schema

This commit is contained in:
wltsmrz
2015-10-05 12:16:25 -07:00
parent 806a4e823f
commit 772f79ae21
3 changed files with 18 additions and 27 deletions

View File

@@ -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"}
}

View File

@@ -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;

View File

@@ -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', () => {