Add schemas for options for each ledger request

src/api/common/schemas/options.json

@@ -1,32 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "options",
-  "description": "Options for a ledger request",
-  "type": "object",
-  "properties": {
-    "currency": {"$ref": "currency"},
-    "counterparty": {"$ref": "address"},
-    "limit": {
-      "type": "integer",
-      "minimum": 1
-    },
-    "ledgerHash": {
-      "type": "string",
-      "format": "ledgerHash"
-    },
-    "ledgerVersion": {"$ref": "ledgerVersion"},
-    "minLedgerVersion": {"$ref": "ledgerVersion"},
-    "maxLedgerVersion": {"$ref": "ledgerVersion"},
-    "marker": {
-      "type": "string"
-    }
-  },
-  "additionalProperties": false,
-  "dependencies": {
-    "marker": ["ledgerVersion"]
-  },
-  "not": {
-    "description": "Fixed fee and max fee are mutually exclusive",
-    "required": ["fee", "maxFee"]
-  }
-}

src/api/common/schemas/orders-options.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "orders-options",
+  "description": "Options for getOrders and getOrderbook",
+  "type": "object",
+  "properties": {
+    "limit": {
+      "type": "integer",
+      "minimum": 1
+    },
+    "ledgerVersion": {"$ref": "ledgerVersion"}
+  },
+  "additionalProperties": false
+}

src/api/common/schemas/settings-options.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "settings-options",
+  "description": "Options for getSettings",
+  "type": "object",
+  "properties": {
+    "ledgerVersion": {"$ref": "ledgerVersion"}
+  },
+  "additionalProperties": false
+}

src/api/common/schemas/transaction-options.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "transaction-options",
+  "description": "Options for getTransaction",
+  "type": "object",
+  "properties": {
+    "minLedgerVersion": {"$ref": "ledgerVersion"},
+    "maxLedgerVersion": {"$ref": "ledgerVersion"}
+  },
+  "additionalProperties": false
+}

src/api/common/schemas/transactions-options.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "acct-tx-options",
+  "title": "transactions-options",
   "description": "Options for getTransactions",
   "type": "object",
   "properties": {

src/api/common/schemas/trustlines-options.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "trustlines-options",
+  "description": "Options for getTrustlines and getBalances",
+  "type": "object",
+  "properties": {
+    "counterparty": {"$ref": "address"},
+    "currency": {"$ref": "currency"},
+    "limit": {
+      "type": "integer",
+      "minimum": 1
+    },
+    "ledgerVersion": {"$ref": "ledgerVersion"}
+  },
+  "additionalProperties": false
+}

src/api/common/validate.js

@@ -52,7 +52,13 @@ module.exports = {
   trustline: _.partial(schemaValidate, 'trustline'),
   txJSON: _.partial(schemaValidate, 'tx'),
   blob: _.partial(schemaValidate, 'blob'),
-  getTransactionsOptions: _.partial(validateOptions, 'acct-tx-options'),
+  getTransactionsOptions: _.partial(validateOptions, 'transactions-options'),
+  getSettingsOptions: _.partial(validateOptions, 'settings-options'),
+  getTrustlinesOptions: _.partial(validateOptions, 'trustlines-options'),
+  getBalancesOptions: _.partial(validateOptions, 'trustlines-options'),
+  getOrdersOptions: _.partial(validateOptions, 'orders-options'),
+  getOrderbookOptions: _.partial(validateOptions, 'orders-options'),
+  getTransactionOptions: _.partial(validateOptions, 'transaction-options'),
   options: _.partial(validateOptions, 'options'),
   instructions: _.partial(schemaValidate, 'instructions')
 };

src/api/ledger/balances.js

@@ -25,7 +25,7 @@ function formatBalances(balances) {
 
 function getBalances(account, options, callback) {
   validate.address(account);
-  validate.options(options);
+  validate.getBalancesOptions(options);
 
   const ledgerVersion = options.ledgerVersion
                       || this.remote.getLedgerSequence();

src/api/ledger/orderbook.js

@@ -52,7 +52,7 @@ function formatBidsAndAsks(orderbook, offers) {
 function getOrderbook(account, orderbook, options, callback) {
   validate.address(account);
   validate.orderbook(orderbook);
-  validate.options(options);
+  validate.getOrderbookOptions(options);
 
   const getter = _.partial(getBookOffers, this.remote, account,
     options.ledgerVersion, options.limit);

src/api/ledger/orders.js

@@ -19,9 +19,9 @@ function requestAccountOffers(remote, address, ledgerVersion, options,
   }), callback));
 }
 
-function getAccountOrders(account, options, callback) {
+function getOrders(account, options, callback) {
   validate.address(account);
-  validate.options(options);
+  validate.getOrdersOptions(options);
 
   const defaultLimit = 100;
   const limit = options.limit || defaultLimit;
@@ -34,4 +34,4 @@ function getAccountOrders(account, options, callback) {
       (order) => order.properties.sequence), callback));
 }
 
-module.exports = utils.wrapCatch(getAccountOrders);
+module.exports = utils.wrapCatch(getOrders);

src/api/ledger/settings.js

@@ -36,7 +36,7 @@ function formatSettings(response) {
 
 function getSettings(account, options, callback) {
   validate.address(account);
-  validate.options(options);
+  validate.getSettingsOptions(options);
 
   const request = {
     account: account,

src/api/ledger/transaction.js

@@ -49,7 +49,7 @@ function isTransactionInRange(tx, options) {
 
 function getTransaction(identifier, options, callback) {
   validate.identifier(identifier);
-  validate.options(options);
+  validate.getTransactionOptions(options);
 
   const remote = this.remote;
 

src/api/ledger/trustlines.js

@@ -38,7 +38,7 @@ function getTrustlines(
   callback: () => void
   ): void {
   validate.address(account);
-  validate.options(options);
+  validate.getTrustlinesOptions(options);
 
   const defaultLimit = 100;
   const limit = options.limit || defaultLimit;