From 39ba2613d9a2514c79002e8bbf3facd01071168f Mon Sep 17 00:00:00 2001 From: Stefan Thomas 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/jsonrpc-test.js | 13 +++++-------- test/monitor-test.js | 11 +++++------ test/offer-test.js | 3 +-- test/path-test.js | 3 +-- test/remote-test.js | 3 +-- test/send-test.js | 3 +-- test/server-test.js | 4 ++-- test/testutils.js | 11 ++++------- test/websocket-test.js | 8 +++----- 12 files changed, 37 insertions(+), 45 deletions(-) diff --git a/src/js/config.js b/src/js/config.js index 372b7d261..b8095cc66 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 563edb9c5..4ff2b374d 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 e5bec8e00..550dc2963 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/jsonrpc-test.js b/test/jsonrpc-test.js index c1569ba5d..5140bdb2e 100644 --- a/test/jsonrpc-test.js +++ b/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; diff --git a/test/monitor-test.js b/test/monitor-test.js index 861f4c15d..ecb3e5bac 100644 --- a/test/monitor-test.js +++ b/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; diff --git a/test/offer-test.js b/test/offer-test.js index 07122d1d8..c7d4f7c83 100644 --- a/test/offer-test.js +++ b/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; diff --git a/test/path-test.js b/test/path-test.js index dbc72ef89..481c8caea 100644 --- a/test/path-test.js +++ b/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; diff --git a/test/remote-test.js b/test/remote-test.js index e54afde22..b3fe6d97b 100644 --- a/test/remote-test.js +++ b/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. diff --git a/test/send-test.js b/test/send-test.js index 524841e86..952163ec5 100644 --- a/test/send-test.js +++ b/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; diff --git a/test/server-test.js b/test/server-test.js index dd73127e0..434563c16 100644 --- a/test/server-test.js +++ b/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; diff --git a/test/testutils.js b/test/testutils.js index 3ef6d6354..876aa0765 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; diff --git a/test/websocket-test.js b/test/websocket-test.js index 5f15135cc..b16493b63 100644 --- a/test/websocket-test.js +++ b/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;