JS: Added ripple.config.load convenience function.

src/js/config.js

@@ -1,3 +1,10 @@
 // This object serves as a singleton to store config options
 
-module.exports = {};
+var extend = require("extend");
+
+var config = module.exports = {
+  load: function (newOpts) {
+    extend(config, newOpts);
+    return config;
+  }
+};

src/js/index.js

@@ -11,3 +11,5 @@ exports.Seed = require('./amount').Seed;
 // the official client, it makes sense to expose the SJCL instance so we don't
 // have to include it twice.
 exports.sjcl = require('../../build/sjcl');
+
+exports.config = require('./config');

test/amount-test.js

@@ -1,17 +1,13 @@
 var buster      = require("buster");
 
-var jsbn        = require('../src/js/jsbn.js');
+var jsbn        = require('../src/js/jsbn');
 var BigInteger  = jsbn.BigInteger;
 var nbi         = jsbn.nbi;
 
-var amount      = require("../src/js/amount.js");
-var Amount      = require("../src/js/amount.js").Amount;
-var UInt160     = require("../src/js/amount.js").UInt160;
+var Amount      = require("../src/js/amount").Amount;
+var UInt160     = require("../src/js/uint160").UInt160;
 
-var extend      = require('extend');
-extend(require('../src/js/config'), require('./config'));
-
-var config  = require('./config.js');
+var config      = require('../src/js/config').load(require('./config'));
 
 // XXX Add test cases that push XRP vs non-XRP behavior.
 

test/jsonrpc-test.js

@@ -4,16 +4,13 @@ var http      = require("http");
 var jsonrpc   = require("simple-jsonrpc");
 var EventEmitter  = require('events').EventEmitter;
 
-var Amount    = require("../src/js/amount.js").Amount;
-var Remote    = require("../src/js/remote.js").Remote;
-var Server    = require("./server.js").Server;
+var Amount    = require("../src/js/amount").Amount;
+var Remote    = require("../src/js/remote").Remote;
+var Server    = require("./server").Server;
 
-var testutils = require("./testutils.js");
+var testutils = require("./testutils");
 
-var config = require("./config.js");
-
-var extend    = require('extend');
-extend(require('../src/js/config'), require('./config'));
+var config    = require('../src/js/config').load(require('./config'));
 
 // How long to wait for server to start.
 var serverDelay = 1500;

test/monitor-test.js

@@ -1,14 +1,13 @@
 var async     = require("async");
 var buster    = require("buster");
 
-var Amount    = require("../src/js/amount.js").Amount;
-var Remote    = require("../src/js/remote.js").Remote;
-var Server    = require("./server.js").Server;
+var Amount    = require("../src/js/amount").Amount;
+var Remote    = require("../src/js/remote").Remote;
+var Server    = require("./server").Server;
 
-var testutils = require("./testutils.js");
+var testutils = require("./testutils");
 
-var extend    = require('extend');
-extend(require('../src/js/config'), require('./config'));
+require('../src/js/config').load(require('./config'));
 
 buster.testRunner.timeout = 5000;
 

test/offer-test.js

@@ -9,8 +9,7 @@ var Server      = require("./server").Server;
 
 var testutils = require("./testutils");
 
-var extend      = require('extend');
-extend(require('../src/js/config'), require('./config'));
+require('../src/js/config').load(require('./config'));
 
 buster.testRunner.timeout = 5000;
 

test/path-test.js

@@ -7,8 +7,7 @@ var Server    = require("./server.js").Server;
 
 var testutils = require("./testutils.js");
 
-var extend    = require('extend');
-extend(require('../src/js/config'), require('./config'));
+require('../src/js/config').load(require('./config'));
 
 buster.testRunner.timeout = 5000;
 

test/remote-test.js

@@ -6,8 +6,7 @@ var Server    = require("./server.js").Server;
 
 var testutils = require("./testutils.js");
 
-var extend      = require('extend');
-extend(require('../src/js/config'), require('./config'));
+var config  = require('../src/js/config').load(require('./config'));
 
 // How long to wait for server to start.
 var serverDelay = 1500;   // XXX Not implemented.

test/send-test.js

@@ -7,8 +7,7 @@ var Server    = require("./server.js").Server;
 
 var testutils = require("./testutils.js");
 
-var extend      = require('extend');
-extend(require('../src/js/config'), require('./config'));
+var config  = require('../src/js/config').load(require('./config'));
 
 // How long to wait for server to start.
 var serverDelay = 1500;

test/server-test.js

@@ -1,6 +1,6 @@
 var buster  = require("buster");
-var testutils = require("./testutils.js");
-var Server  = require("./server.js").Server;
+var testutils = require("./testutils");
+var Server  = require("./server").Server;
 
 // How long to wait for server to start.
 // var serverDelay = 1500;

test/testutils.js

@@ -1,13 +1,10 @@
 var async   = require("async");
 
-var Amount  = require("../src/js/amount.js").Amount;
-var Remote  = require("../src/js/remote.js").Remote;
-var Server  = require("./server.js").Server;
+var Amount  = require("../src/js/amount").Amount;
+var Remote  = require("../src/js/remote").Remote;
+var Server  = require("./server").Server;
 
-var extend  = require('extend');
-extend(require('../src/js/config'), require('./config'));
-
-var config  = require("./config.js");
+var config  = require('../src/js/config').load(require('./config'));
 
 var account_dump = function (remote, account, callback) {
   var self = this;

test/websocket-test.js

@@ -1,11 +1,9 @@
 var buster  = require("buster");
 
-var Server  = require("./server.js").Server;
-var Remote  = require("../src/js/remote.js").Remote;
-var config  = require("./config.js");
+var Server  = require("./server").Server;
+var Remote  = require("../src/js/remote").Remote;
 
-var extend  = require('extend');
-extend(require('../src/js/config'), require('./config'));
+var config  = require('../src/js/config').load(require('./config'));
 
 buster.testRunner.timeout = 5000;