use single rippleAPI instance

Author: shekenahglory

api/index.js

@@ -3,7 +3,8 @@ var Server  = require('./server');
 var options = {
   postgres : config.get('postgres'),
   hbase    : config.get('hbase'),
-  port     : config.get('port')
+  port     : config.get('port'),
+  ripple   : config.get('ripple')
 }
 
 var server = new Server(options);

api/routesV2/accountBalances.js

@@ -4,13 +4,9 @@ var Logger = require('../../lib/logger');
 var log = new Logger({scope : 'account balances'});
 var request = require('request');
 var smoment = require('../../lib/smoment');
-var config  = require('../../config/api.config');
-var ripple = require('ripple-lib');
-var rippleAPI = new ripple.RippleAPI(config.get('ripple'));
+var rippleAPI;
 var hbase;
 
-rippleAPI.connect();
-
 var accountBalances = function (req, res, next) {
 
   var options = {
@@ -156,7 +152,8 @@ var accountBalances = function (req, res, next) {
   }
 };
 
-module.exports = function(db) {
+module.exports = function(db, r) {
   hbase = db;
+  rippleAPI = r;
   return accountBalances;
 };

api/routesV2/accountOrders.js

@@ -4,13 +4,9 @@ var Logger = require('../../lib/logger');
 var log = new Logger({scope : 'account orders'});
 var request = require('request');
 var smoment = require('../../lib/smoment');
-var config = require('../../config/api.config');
-var ripple = require('ripple-lib');
-var rippleAPI = new ripple.RippleAPI(config.get('ripple'));
+var rippleAPI;
 var hbase;
 
-rippleAPI.connect();
-
 function accountOrders(req, res) {
   var options = {
     ledger_index: req.query.ledger_index || req.query.ledger,
@@ -153,7 +149,8 @@ function accountOrders(req, res) {
   }
 }
 
-module.exports = function(db) {
+module.exports = function(db, r) {
   hbase = db;
+  rippleAPI = r;
   return accountOrders;
 };

api/routesV2/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(db) {
+module.exports = function(db, rippleAPI) {
   var Routes = { };
 
   Routes.getLedger = require('./getLedger')(db);
@@ -9,8 +9,8 @@ module.exports = function(db) {
   Routes.accountTransactions = require('./accountTransactions')(db);
   Routes.accountExchanges = require('./accountExchanges')(db);
   Routes.accountPayments = require('./accountPayments')(db);
-  Routes.accountBalances = require('./accountBalances')(db);
-  Routes.accountOrders = require('./accountOrders')(db);
+  Routes.accountBalances = require('./accountBalances')(db, rippleAPI);
+  Routes.accountOrders = require('./accountOrders')(db, rippleAPI);
   Routes.getChanges = require('./accountBalanceChanges')(db);
   Routes.getPayments = require('./getPayments')(db);
   Routes.getExchanges = require('./getExchanges')(db);

api/server.js

@@ -11,15 +11,19 @@ var RoutesV2 = require('./routesV2');
 var map = require('./apiMap');
 var json2csv = require('nice-json2csv');
 var favicon = require('serve-favicon');
+var ripple = require('ripple-lib');
 
 var Server = function (options) {
+  var rippleAPI = new ripple.RippleAPI(options.ripple);
   var app = express();
   var hbase;
   var routesV2;
   var postgres;
   var routes;
   var server;
 
+  rippleAPI.connect();
+
   app.use(bodyParser.json());
   app.use(bodyParser.urlencoded({extended:true}));
   app.use(json2csv.expressDecorator);
@@ -40,7 +44,7 @@ var Server = function (options) {
   // v2 routes (requires hbase)
   if (options.hbase) {
     hbase = new Hbase(options.hbase);
-    routesV2 = RoutesV2(hbase);
+    routesV2 = RoutesV2(hbase, rippleAPI);
 
     app.get('/v2/health/:aspect?', routesV2.checkHealth);
     app.get('/v2/gateways/:gateway?', routesV2.gateways.Gateways);

config/api.config.js

@@ -3,5 +3,5 @@ var nconf = require('nconf');
 nconf.argv()
   .env()
   .file({ file: './config/api.config.json' });
-  
-module.exports = nconf;
+
+module.exports = nconf;

config/import.config.js

@@ -3,5 +3,4 @@ var nconf = require('nconf');
 nconf.argv()
   .env()
   .file({ file: './config/import.config.json' });
-  
-module.exports = nconf;
+module.exports = nconf;

test/hbaseTests/setup.js

@@ -1,5 +1,5 @@
-var config = require('../../config/import.config');
 var Server = require('../../api/server');
+var config = require('../../config/import.config');
 var assert = require('assert');
 var request = require('request');
 var hbaseConfig = config.get('hbase');

test/hbaseTests/test.network.js

@@ -31,7 +31,7 @@ describe('network - exchange volume', function() {
       hbase.putRow(table, 'payment_volume|day|20150114000000', mockPaymentVolume),
       hbase.putRow(table, 'issued_value|20150114000000', mockIssuedValue),
       hbase.putRow(table, 'issued_value|20150113000000', mockIssuedValue)
-    ]).nodeify(function(err, resp){
+    ]).nodeify(function(err, resp) {
       assert.ifError(err);
       done();
     });