From 49af9f20d92298c5779e864791c966b9d5b50ddb Mon Sep 17 00:00:00 2001
From: Stefan Thomas <justmoon@members.fsf.org>
Date: Sat, 2 Feb 2013 14:05:37 +0100
Subject: [PATCH] JS: Added ripple.config.load convenience function.

---
 src/js/config.js    |  9 ++++++++-
 src/js/index.js     |  2 ++
 test/amount-test.js | 12 ++++--------
 test/testutils.js   | 11 ++++-------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/js/config.js b/src/js/config.js
index 372b7d26..b8095cc6 100644
--- a/src/js/config.js
+++ b/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;
+  }
+};
diff --git a/src/js/index.js b/src/js/index.js
index 563edb9c..4ff2b374 100644
--- a/src/js/index.js
+++ b/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');
diff --git a/test/amount-test.js b/test/amount-test.js
index e5bec8e0..550dc296 100644
--- a/test/amount-test.js
+++ b/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.
 
diff --git a/test/testutils.js b/test/testutils.js
index 3ef6d635..876aa076 100644
--- a/test/testutils.js
+++ b/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;