From 22a954deedb1f92c7dd848d9ed52dfb3567be971 Mon Sep 17 00:00:00 2001 From: Stefan Thomas Date: Mon, 6 May 2013 21:25:36 +0200 Subject: [PATCH] Changed directory structure to be more like server's. src/js/*.js -> src/js/ripple/ --- Gruntfile.js | 4 ++-- package.json | 4 ++-- src/js/README.md | 3 --- src/js/{ => ripple}/account.js | 0 src/js/{ => ripple}/amount.js | 2 +- src/js/{ => ripple}/base.js | 2 +- src/js/{ => ripple}/binformat.js | 0 src/js/{ => ripple}/config.js | 0 src/js/{ => ripple}/currency.js | 0 src/js/{ => ripple}/index.js | 2 +- src/js/{ => ripple}/jsbn.js | 0 src/js/{ => ripple}/keypair.js | 2 +- src/js/{ => ripple}/meta.js | 0 src/js/{ => ripple}/network.js | 0 src/js/{ => ripple}/orderbook.js | 0 src/js/{ => ripple}/remote.js | 2 +- src/js/{ => ripple}/seed.js | 2 +- src/js/{ => ripple}/serializedobject.js | 2 +- src/js/{ => ripple}/serializedtypes.js | 2 +- src/js/{ => ripple}/server.js | 0 src/js/{ => ripple}/transaction.js | 2 +- src/js/{ => ripple}/uint.js | 2 +- src/js/{ => ripple}/uint160.js | 2 +- src/js/{ => ripple}/uint256.js | 2 +- src/js/{ => ripple}/utils.js | 0 src/js/{ => ripple}/utils.web.js | 0 test/amount-test.js | 8 ++++---- test/base58-test.js | 4 ++-- test/sign-test.js | 4 ++-- test/testutils.js | 6 +++--- test/utils-test.js | 2 +- 31 files changed, 28 insertions(+), 31 deletions(-) delete mode 100644 src/js/README.md rename src/js/{ => ripple}/account.js (100%) rename src/js/{ => ripple}/amount.js (99%) rename src/js/{ => ripple}/base.js (98%) rename src/js/{ => ripple}/binformat.js (100%) rename src/js/{ => ripple}/config.js (100%) rename src/js/{ => ripple}/currency.js (100%) rename src/js/{ => ripple}/index.js (94%) rename src/js/{ => ripple}/jsbn.js (100%) rename src/js/{ => ripple}/keypair.js (96%) rename src/js/{ => ripple}/meta.js (100%) rename src/js/{ => ripple}/network.js (100%) rename src/js/{ => ripple}/orderbook.js (100%) rename src/js/{ => ripple}/remote.js (99%) rename src/js/{ => ripple}/seed.js (98%) rename src/js/{ => ripple}/serializedobject.js (98%) rename src/js/{ => ripple}/serializedtypes.js (99%) rename src/js/{ => ripple}/server.js (100%) rename src/js/{ => ripple}/transaction.js (99%) rename src/js/{ => ripple}/uint.js (99%) rename src/js/{ => ripple}/uint160.js (97%) rename src/js/{ => ripple}/uint256.js (95%) rename src/js/{ => ripple}/utils.js (100%) rename src/js/{ => ripple}/utils.web.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 656ce278..e5e63aab 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -47,7 +47,7 @@ module.exports = function(grunt) { }, webpack: { options: { - entry: "./src/js/index.js", + entry: "./src/js/ripple/index.js", library: "ripple" }, lib: { @@ -86,7 +86,7 @@ module.exports = function(grunt) { options: { title: "Test" }, - src: ['src/js/'], + src: ['src/js/ripple/'], dest: 'build/docs' } } diff --git a/package.json b/package.json index 353bbba4..86214054 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,11 @@ "version": "0.7.11", "description": "Ripple JavaScript client library", "files": [ - "src/js/*.js", + "src/js/ripple/*.js", "build/sjcl.js", "bin/rsign.js" ], - "main": "src/js", + "main": "src/js/ripple", "directories": { "test": "test" }, diff --git a/src/js/README.md b/src/js/README.md deleted file mode 100644 index 7b357e08..00000000 --- a/src/js/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Ripple JavaScript library - -This library lets you connect to a ripple server via websockets. diff --git a/src/js/account.js b/src/js/ripple/account.js similarity index 100% rename from src/js/account.js rename to src/js/ripple/account.js diff --git a/src/js/amount.js b/src/js/ripple/amount.js similarity index 99% rename from src/js/amount.js rename to src/js/ripple/amount.js index 3d3fee8e..fe256cbe 100644 --- a/src/js/amount.js +++ b/src/js/ripple/amount.js @@ -1,7 +1,7 @@ // Represent Ripple amounts and currencies. // - Numbers in hex are big-endian. -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var bn = sjcl.bn; var utils = require('./utils'); var jsbn = require('./jsbn'); diff --git a/src/js/base.js b/src/js/ripple/base.js similarity index 98% rename from src/js/base.js rename to src/js/ripple/base.js index be2cab48..903c2495 100644 --- a/src/js/base.js +++ b/src/js/ripple/base.js @@ -1,5 +1,5 @@ -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var utils = require('./utils'); var jsbn = require('./jsbn'); var extend = require('extend'); diff --git a/src/js/binformat.js b/src/js/ripple/binformat.js similarity index 100% rename from src/js/binformat.js rename to src/js/ripple/binformat.js diff --git a/src/js/config.js b/src/js/ripple/config.js similarity index 100% rename from src/js/config.js rename to src/js/ripple/config.js diff --git a/src/js/currency.js b/src/js/ripple/currency.js similarity index 100% rename from src/js/currency.js rename to src/js/ripple/currency.js diff --git a/src/js/index.js b/src/js/ripple/index.js similarity index 94% rename from src/js/index.js rename to src/js/ripple/index.js index 139c71cb..bcfa829d 100644 --- a/src/js/index.js +++ b/src/js/ripple/index.js @@ -15,7 +15,7 @@ exports.utils = require('./utils'); // However, for programs that are tied to a specific version of ripple.js like // 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.sjcl = require('../../../build/sjcl'); exports.config = require('./config'); diff --git a/src/js/jsbn.js b/src/js/ripple/jsbn.js similarity index 100% rename from src/js/jsbn.js rename to src/js/ripple/jsbn.js diff --git a/src/js/keypair.js b/src/js/ripple/keypair.js similarity index 96% rename from src/js/keypair.js rename to src/js/ripple/keypair.js index 7c6a559d..7976b8fa 100644 --- a/src/js/keypair.js +++ b/src/js/ripple/keypair.js @@ -1,4 +1,4 @@ -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var UInt256 = require('./uint256').UInt256; diff --git a/src/js/meta.js b/src/js/ripple/meta.js similarity index 100% rename from src/js/meta.js rename to src/js/ripple/meta.js diff --git a/src/js/network.js b/src/js/ripple/network.js similarity index 100% rename from src/js/network.js rename to src/js/ripple/network.js diff --git a/src/js/orderbook.js b/src/js/ripple/orderbook.js similarity index 100% rename from src/js/orderbook.js rename to src/js/ripple/orderbook.js diff --git a/src/js/remote.js b/src/js/ripple/remote.js similarity index 99% rename from src/js/remote.js rename to src/js/ripple/remote.js index 94181346..72cdb099 100644 --- a/src/js/remote.js +++ b/src/js/ripple/remote.js @@ -29,7 +29,7 @@ var OrderBook = require('./orderbook').OrderBook; var utils = require('./utils'); var config = require('./config'); -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); // Request events emitted: // 'success' : Request successful. diff --git a/src/js/seed.js b/src/js/ripple/seed.js similarity index 98% rename from src/js/seed.js rename to src/js/ripple/seed.js index 11d1f226..d6b3fa08 100644 --- a/src/js/seed.js +++ b/src/js/ripple/seed.js @@ -2,7 +2,7 @@ // Seed support // -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var utils = require('./utils'); var jsbn = require('./jsbn'); var extend = require('extend'); diff --git a/src/js/serializedobject.js b/src/js/ripple/serializedobject.js similarity index 98% rename from src/js/serializedobject.js rename to src/js/ripple/serializedobject.js index f346f695..fd96232b 100644 --- a/src/js/serializedobject.js +++ b/src/js/ripple/serializedobject.js @@ -1,5 +1,5 @@ var binformat = require('./binformat'), - sjcl = require('../../build/sjcl'), + sjcl = require('../../../build/sjcl'), extend = require('extend'), stypes = require('./serializedtypes'); diff --git a/src/js/serializedtypes.js b/src/js/ripple/serializedtypes.js similarity index 99% rename from src/js/serializedtypes.js rename to src/js/ripple/serializedtypes.js index a3a2808d..e402788c 100644 --- a/src/js/serializedtypes.js +++ b/src/js/ripple/serializedtypes.js @@ -8,7 +8,7 @@ var extend = require('extend'), utils = require('./utils'), - sjcl = require('../../build/sjcl'); + sjcl = require('../../../build/sjcl'); var amount = require('./amount'), UInt160 = amount.UInt160, diff --git a/src/js/server.js b/src/js/ripple/server.js similarity index 100% rename from src/js/server.js rename to src/js/ripple/server.js diff --git a/src/js/transaction.js b/src/js/ripple/transaction.js similarity index 99% rename from src/js/transaction.js rename to src/js/ripple/transaction.js index c83ad51d..c7408f41 100644 --- a/src/js/transaction.js +++ b/src/js/ripple/transaction.js @@ -46,7 +46,7 @@ var EventEmitter = require('events').EventEmitter; var util = require('util'); -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var Amount = require('./amount').Amount; var Currency = require('./amount').Currency; diff --git a/src/js/uint.js b/src/js/ripple/uint.js similarity index 99% rename from src/js/uint.js rename to src/js/ripple/uint.js index 457e3e95..a3220163 100644 --- a/src/js/uint.js +++ b/src/js/ripple/uint.js @@ -1,5 +1,5 @@ -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var utils = require('./utils'); var config = require('./config'); var jsbn = require('./jsbn'); diff --git a/src/js/uint160.js b/src/js/ripple/uint160.js similarity index 97% rename from src/js/uint160.js rename to src/js/ripple/uint160.js index 830eeaa8..4aaf9da0 100644 --- a/src/js/uint160.js +++ b/src/js/ripple/uint160.js @@ -1,5 +1,5 @@ -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var utils = require('./utils'); var config = require('./config'); var jsbn = require('./jsbn'); diff --git a/src/js/uint256.js b/src/js/ripple/uint256.js similarity index 95% rename from src/js/uint256.js rename to src/js/ripple/uint256.js index 42b01504..b2c16dec 100644 --- a/src/js/uint256.js +++ b/src/js/ripple/uint256.js @@ -1,5 +1,5 @@ -var sjcl = require('../../build/sjcl'); +var sjcl = require('../../../build/sjcl'); var utils = require('./utils'); var config = require('./config'); var jsbn = require('./jsbn'); diff --git a/src/js/utils.js b/src/js/ripple/utils.js similarity index 100% rename from src/js/utils.js rename to src/js/ripple/utils.js diff --git a/src/js/utils.web.js b/src/js/ripple/utils.web.js similarity index 100% rename from src/js/utils.web.js rename to src/js/ripple/utils.web.js diff --git a/test/amount-test.js b/test/amount-test.js index a6d3e0a5..dc7aeec7 100644 --- a/test/amount-test.js +++ b/test/amount-test.js @@ -1,13 +1,13 @@ var buster = require("buster"); -var jsbn = require('../src/js/jsbn'); +var jsbn = require('../src/js/ripple/jsbn'); var BigInteger = jsbn.BigInteger; var nbi = jsbn.nbi; -var Amount = require("../src/js/amount").Amount; -var UInt160 = require("../src/js/uint160").UInt160; +var Amount = require("../src/js/ripple/amount").Amount; +var UInt160 = require("../src/js/ripple/uint160").UInt160; -var config = require('../src/js/config').load(require('./config')); +var config = require('../src/js/ripple/config').load(require('./config')); // XXX Add test cases that push XRP vs non-XRP behavior. diff --git a/test/base58-test.js b/test/base58-test.js index c143de7b..901f1e28 100644 --- a/test/base58-test.js +++ b/test/base58-test.js @@ -1,8 +1,8 @@ var buster = require("buster"); -var Seed = require("../src/js/seed").Seed; +var Seed = require("../src/js/ripple/seed").Seed; -var config = require('../src/js/config').load(require('./config')); +var config = require('../src/js/ripple/config').load(require('./config')); buster.testCase("Base58", { "Seed" : { diff --git a/test/sign-test.js b/test/sign-test.js index 405c8ba5..47d053f7 100644 --- a/test/sign-test.js +++ b/test/sign-test.js @@ -1,8 +1,8 @@ var buster = require("buster"); -var Seed = require("../src/js/seed").Seed; +var Seed = require("../src/js/ripple/seed").Seed; -var config = require('../src/js/config').load(require('./config')); +var config = require('../src/js/ripple/config').load(require('./config')); buster.testCase("Signing", { "Keys" : { diff --git a/test/testutils.js b/test/testutils.js index 0799ee97..7a3216a2 100644 --- a/test/testutils.js +++ b/test/testutils.js @@ -1,10 +1,10 @@ var async = require("async"); -var Amount = require("../src/js/amount").Amount; -var Remote = require("../src/js/remote").Remote; +var Amount = require("../src/js/ripple/amount").Amount; +var Remote = require("../src/js/ripple/remote").Remote; var Server = require("./server").Server; -var config = require('../src/js/config').load(require('./config')); +var config = require('../src/js/ripple/config').load(require('./config')); var account_dump = function (remote, account, callback) { var self = this; diff --git a/test/utils-test.js b/test/utils-test.js index c1f8f8f9..8d6964e4 100644 --- a/test/utils-test.js +++ b/test/utils-test.js @@ -1,7 +1,7 @@ var fs = require("fs"); var buster = require("buster"); -var utils = require("../src/js/utils.js"); +var utils = require("../src/js/ripple/utils.js"); buster.testCase("Utils", { "hexToString and stringToHex" : {