Move schemas to api/lib/

isuncoin · Mar 16, 2015 · 375d40a · 375d40a
1 parent af4389d
commit 375d40a
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 6 deletions.
diff --git a/api/lib/db-interface.js b/api/lib/db-interface.js
@@ -13,7 +13,7 @@ var defaultLogger = {
   info: noop,
   warn: noop,
   error: noop
-}
+};
 
 /**
  * @constructor DatabaseInterface

diff --git a/api/lib/schema-validator.js b/api/lib/schema-validator.js
@@ -3,7 +3,7 @@ var fs = require('fs');
 var path = require('path');
 var JaySchema = require('jayschema');
 
-var baseDir = path.join(__dirname, '../../schemas');
+var baseDir = path.join(__dirname, './schemas');
 
 module.exports = (function() {
   var validator = new JaySchema();

diff --git a/schemas/AccountSettings.json → api/lib/schemas/AccountSettings.json b/schemas/AccountSettings.json → api/lib/schemas/AccountSettings.json
diff --git a/schemas/Amount.json → api/lib/schemas/Amount.json b/schemas/Amount.json → api/lib/schemas/Amount.json
diff --git a/schemas/Balance.json → api/lib/schemas/Balance.json b/schemas/Balance.json → api/lib/schemas/Balance.json
diff --git a/schemas/Currency.json → api/lib/schemas/Currency.json b/schemas/Currency.json → api/lib/schemas/Currency.json
diff --git a/schemas/FloatString.json → api/lib/schemas/FloatString.json b/schemas/FloatString.json → api/lib/schemas/FloatString.json
diff --git a/schemas/Hash128.json → api/lib/schemas/Hash128.json b/schemas/Hash128.json → api/lib/schemas/Hash128.json
diff --git a/schemas/Hash256.json → api/lib/schemas/Hash256.json b/schemas/Hash256.json → api/lib/schemas/Hash256.json
diff --git a/schemas/Notification.json → api/lib/schemas/Notification.json b/schemas/Notification.json → api/lib/schemas/Notification.json
diff --git a/schemas/Order.json → api/lib/schemas/Order.json b/schemas/Order.json → api/lib/schemas/Order.json
diff --git a/schemas/Payment.json → api/lib/schemas/Payment.json b/schemas/Payment.json → api/lib/schemas/Payment.json
diff --git a/schemas/ResourceId.json → api/lib/schemas/ResourceId.json b/schemas/ResourceId.json → api/lib/schemas/ResourceId.json
diff --git a/schemas/Timestamp.json → api/lib/schemas/Timestamp.json b/schemas/Timestamp.json → api/lib/schemas/Timestamp.json
diff --git a/schemas/Trustline.json → api/lib/schemas/Trustline.json b/schemas/Trustline.json → api/lib/schemas/Trustline.json
diff --git a/schemas/UINT32.json → api/lib/schemas/UINT32.json b/schemas/UINT32.json → api/lib/schemas/UINT32.json
diff --git a/schemas/URL.json → api/lib/schemas/URL.json b/schemas/URL.json → api/lib/schemas/URL.json
diff --git a/api/transactions.js b/api/transactions.js
@@ -364,8 +364,7 @@ function getTransaction(api, account, identifier, callback) {
  * See getTransaction for parameter details
  */
 function getTransactionAndRespond(account, identifier, callback) {
-  var api = this;
-  getTransaction(api, account, identifier, function(error, transaction) {
+  getTransaction(this, account, identifier, function(error, transaction) {
     if (error) {
       callback(error);
     } else {

diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 'use strict';
 var router = require('./server/router.js');
-var remote = require('./api/lib/remote.js');
+var remote = require('./server/api').remote;
 
 function RippleRestPlugin() {
   this.router = router;

diff --git a/schemas/config.json → server/config-schema.json b/schemas/config.json → server/config-schema.json
diff --git a/server/config.js b/server/config.js
@@ -4,7 +4,7 @@ var path = require('path');
 var nconf = require('nconf');
 var JaySchema = require('jayschema');
 var formatJaySchemaErrors = require('jayschema-error-messages');
-var configSchema = require('../schemas/config.json');
+var configSchema = require('./config-schema.json');
 var exampleConfig = require('../config-example.json');
 
 /**