From 230a80852af61e44f92349ccbae05702b3c657bb Mon Sep 17 00:00:00 2001 From: Chris Clark Date: Mon, 16 Nov 2015 10:54:53 -0800 Subject: [PATCH] Remove "closed" from getLedger response --- src/common/schemas/output/get-ledger.json | 5 ----- src/common/schemas/output/get-settings.json | 4 ++-- src/ledger/parse/fields.js | 2 +- src/ledger/parse/ledger.js | 1 - src/offline/ledgerhash.js | 2 -- test/fixtures/requests/compute-ledger-hash.json | 1 - test/fixtures/responses/get-ledger-full.json | 1 - test/fixtures/responses/get-ledger-with-settings-tx.json | 1 - test/fixtures/responses/get-ledger.json | 1 - 9 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/common/schemas/output/get-ledger.json b/src/common/schemas/output/get-ledger.json index 2ea2a8ab..897317a2 100644 --- a/src/common/schemas/output/get-ledger.json +++ b/src/common/schemas/output/get-ledger.json @@ -3,10 +3,6 @@ "title": "getLedger", "type": "object", "properties": { - "closed": { - "type": "boolean", - "description": "Whether or not this ledger has been closed. This should always be true." - }, "stateHash": { "$ref": "hash256", "description": "Hash of all state information in this ledger." @@ -83,7 +79,6 @@ } }, "required": [ - "closed", "stateHash", "closeTime", "closeTimeResolution", diff --git a/src/common/schemas/output/get-settings.json b/src/common/schemas/output/get-settings.json index 4fbefeb9..73ed043a 100644 --- a/src/common/schemas/output/get-settings.json +++ b/src/common/schemas/output/get-settings.json @@ -47,7 +47,7 @@ ] }, "walletLocator": { - "description": "Not used.", + "description": "Hash of wallet in content-addressable storage (CAS) in the Ripple Consensus Ledger (not implemented yet). Use `null` to delete.", "oneOf": [ {"type": "null"}, {"$ref": "hash256"} @@ -55,7 +55,7 @@ }, "walletSize": { "type": ["integer", "null"], - "description": "Not used." + "description": "Size of wallet in content-addressable storage (CAS) in the Ripple Consensus Ledger (not implemeneted yet). Use `null` to delete." }, "messageKey": { "type": "string", diff --git a/src/ledger/parse/fields.js b/src/ledger/parse/fields.js index ed006248..fb04704c 100644 --- a/src/ledger/parse/fields.js +++ b/src/ledger/parse/fields.js @@ -4,7 +4,7 @@ const BigNumber = require('bignumber.js'); const AccountFields = require('./utils').constants.AccountFields; function parseField(info, value) { - if (info.encoding === 'hex' && !info.length) { + if (info.encoding === 'hex' && !info.length) { // e.g. "domain" return new Buffer(value, 'hex').toString('ascii'); } if (info.shift) { diff --git a/src/ledger/parse/ledger.js b/src/ledger/parse/ledger.js index 62715835..7d7fbefb 100644 --- a/src/ledger/parse/ledger.js +++ b/src/ledger/parse/ledger.js @@ -42,7 +42,6 @@ function parseState(state) { function parseLedger(ledger: Object): GetLedger { const ledgerVersion = parseInt(ledger.ledger_index || ledger.seqNum, 10); return removeUndefined(_.assign({ - closed: ledger.closed, stateHash: ledger.account_hash, closeTime: rippleTimeToISO8601(ledger.close_time), closeTimeResolution: ledger.close_time_resolution, diff --git a/src/offline/ledgerhash.js b/src/offline/ledgerhash.js index 039de60e..26ef83b3 100644 --- a/src/offline/ledgerhash.js +++ b/src/offline/ledgerhash.js @@ -6,8 +6,6 @@ const hashes = require('ripple-hashes'); function convertLedgerHeader(header) { return { - accepted: header.accepted, - closed: header.closed, account_hash: header.stateHash, close_time: common.iso8601ToRippleTime(header.closeTime), close_time_resolution: header.closeTimeResolution, diff --git a/test/fixtures/requests/compute-ledger-hash.json b/test/fixtures/requests/compute-ledger-hash.json index e2a76348..0d89fcb0 100644 --- a/test/fixtures/requests/compute-ledger-hash.json +++ b/test/fixtures/requests/compute-ledger-hash.json @@ -4,7 +4,6 @@ "parentCloseTime": "2015-08-12T01:01:00.000Z", "closeFlags": 0, "closeTimeResolution": 10, - "closed": true, "ledgerVersion": 15202439, "parentLedgerHash": "12724A65B030C15A1573AA28B1BBB5DF3DA4589AA3623675A31CAE69B23B1C4E", "totalDrops": "99998831688050493", diff --git a/test/fixtures/responses/get-ledger-full.json b/test/fixtures/responses/get-ledger-full.json index 752b6056..e552b52d 100644 --- a/test/fixtures/responses/get-ledger-full.json +++ b/test/fixtures/responses/get-ledger-full.json @@ -1,5 +1,4 @@ { - "closed": true, "stateHash": "2C23D15B6B549123FB351E4B5CDE81C564318EB845449CD43C3EA7953C4DB452", "closeTime": "2013-01-02T06:43:20.000Z", "closeFlags": 0, diff --git a/test/fixtures/responses/get-ledger-with-settings-tx.json b/test/fixtures/responses/get-ledger-with-settings-tx.json index ca3e0eb6..5a6137ed 100644 --- a/test/fixtures/responses/get-ledger-with-settings-tx.json +++ b/test/fixtures/responses/get-ledger-with-settings-tx.json @@ -1,5 +1,4 @@ { - "closed": true, "stateHash": "2FC964BBFE22DF77A132FE12B5D2B58A09226EBCA73EF2CFF5BE29E56B3315F5", "closeTime": "2014-01-01T00:03:30.000Z", "closeTimeResolution": 10, diff --git a/test/fixtures/responses/get-ledger.json b/test/fixtures/responses/get-ledger.json index dbf1acf1..70c5e59f 100644 --- a/test/fixtures/responses/get-ledger.json +++ b/test/fixtures/responses/get-ledger.json @@ -1,5 +1,4 @@ { - "closed": true, "stateHash": "EC028EC32896D537ECCA18D18BEBE6AE99709FEFF9EF72DBD3A7819E918D8B96", "closeTime": "2014-09-24T21:21:50.000Z", "closeTimeResolution": 10,