Merge pull request #382 from clark800/notifications

Merge notifications functionality into getAccountTransactions

src/api/api.js

@@ -6,7 +6,6 @@ const balances = require('./ledger/balances');
 const settings = require('./ledger/settings');
 const transactions = require('./ledger/transactions');
 const trustlines = require('./ledger/trustlines');
-const notifications = require('./ledger/notifications');
 const payments = require('./ledger/payments');
 const orders = require('./ledger/orders');
 const preparePayment = require('./transaction/payment');
@@ -41,8 +40,6 @@ RippleAPI.prototype = {
   getSettings: settings.getSettings,
   getTransaction: transactions.getTransaction,
   getAccountTransactions: transactions.getAccountTransactions,
-  getNotification: notifications.getNotification,
-  getNotifications: notifications.getNotifications,
 
   preparePayment: preparePayment,
   prepareTrustline: prepareTrustline,

src/api/common/schemas/acct-tx-options.json

@@ -0,0 +1,40 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "acct-tx-options",
+  "description": "Options for getAccountTransactions",
+  "type": "object",
+  "properties": {
+    "start": {"$ref": "hash256"},
+    "limit": {
+      "type": "integer",
+      "minimum": 1
+    },
+    "minLedgerVersion": {"$ref": "ledgerVersion"},
+    "maxLedgerVersion": {"$ref": "ledgerVersion"},
+    "earliestFirst": {"type": "boolean"},
+    "excludeFailures": {"type": "boolean"},
+    "outgoing": {"type": "boolean"},
+    "incoming": {"type": "boolean"},
+    "types": {
+      "type": "array",
+      "items": {
+        "enum": [
+          "payment",
+          "trustline",
+          "order",
+          "orderCancellation",
+          "settings"
+        ]
+      }
+    },
+    "binary": {"type": "boolean"}
+  },
+  "additionalProperties": false,
+  "not": {
+    "anyOf": [
+      {"required": ["incoming", "outgoing"]},
+      {"required": ["start", "minLedgerVersion"]},
+      {"required": ["start", "maxLedgerVersion"]}
+    ]
+  }
+}

src/api/common/validate.js

@@ -33,8 +33,8 @@ function validateLedgerRange(options) {
   }
 }
 
-function validateOptions(options) {
-  schemaValidate('options', options);
+function validateOptions(schema, options) {
+  schemaValidate(schema, options);
   validateLedgerRange(options);
 }
 
@@ -52,6 +52,7 @@ module.exports = {
   trustline: _.partial(schemaValidate, 'trustline'),
   txJSON: _.partial(schemaValidate, 'tx'),
   blob: _.partial(schemaValidate, 'blob'),
-  options: validateOptions,
+  getAccountTransactionsOptions: _.partial(validateOptions, 'acct-tx-options'),
+  options: _.partial(validateOptions, 'options'),
   instructions: _.partial(schemaValidate, 'instructions')
 };