Merge pull request #342 from clark800/remove-cpp

Remove src/cpp and clean up files
XRPLF · May 14, 2015 · e66978f · e66978f
2 parents ab943f3 + c57d528
commit e66978f
Show file tree

Hide file tree

Showing 59 changed files with 507 additions and 542 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,3 +1,2 @@
-deploy
 lib-cov
 coverage.html
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ node_js:
 before_script:
   - npm install -g eslint
   - curl 'https://raw.githubusercontent.com/ripple/javascript-style-guide/master/eslintrc' > ./eslintrc
-  - eslint --reset -c ./eslintrc $(git --no-pager diff --name-only --diff-filter=AM --relative $(git merge-base FETCH_HEAD origin/HEAD) FETCH_HEAD | grep "\.js$")
+  - eslint --reset -c ./eslintrc $(git --no-pager diff --name-only -M100% --diff-filter=AM --relative $(git merge-base FETCH_HEAD origin/HEAD) FETCH_HEAD | grep "\.js$")
 script: MOCHA_REPORTER=tap npm test --coverage
 after_success:
 - npm run coveralls

diff --git a/Gulpfile.js b/Gulpfile.js
@@ -22,7 +22,7 @@ function logPluginError(error) {
 gulp.task('build', function(callback) {
   webpack({
     cache: true,
-    entry: './src/js/ripple/index.js',
+    entry: './src/index.js',
     output: {
       library: 'ripple',
       path: './build/',
@@ -41,7 +41,7 @@ gulp.task('build-min', ['build'], function() {
 gulp.task('build-debug', function(callback) {
   webpack({
     cache: true,
-    entry: './src/js/ripple/index.js',
+    entry: './src/index.js',
     output: {
       library: 'ripple',
       path: './build/',
@@ -66,7 +66,7 @@ function buildUseError(cons) {
 gulp.task('build-core', function(callback) {
   webpack({
     entry: [
-      './src/js/ripple/remote.js'
+      './src/remote.js'
     ],
     externals: [
       {
@@ -115,21 +115,21 @@ gulp.task('bower', ['bower-build', 'bower-build-min', 'bower-build-debug',
                     'bower-version']);
 
 gulp.task('watch', function() {
-  gulp.watch('src/js/ripple/*', ['build-debug']);
+  gulp.watch('src/*', ['build-debug']);
 });
 
 // To use this, each javascript file must have /* @flow */ on the first line
 gulp.task('typecheck', function() {
-  return gulp.src('src/js/ripple/*.js')
+  return gulp.src('src/*.js')
   .pipe(flow({      // note: do not set the 'all' option, it is broken
     weak: true,   // remove this after all errors are addressed
     killFlow: true
   }));
 });
 
 gulp.task('strip', function() {
-  return gulp.src('src/js/ripple/*.js')
-  .pipe(watch('src/js/ripple/*.js'))
+  return gulp.src('src/*.js')
+  .pipe(watch('src/*.js'))
   .pipe(cleanDest('out'))   // delete outdated output file before stripping
   .pipe(plumber())        // prevent an error in one file from ending build
   .pipe(react({stripTypes: true}).on('error', logPluginError))

diff --git a/deploy/start rippled.bat b/deploy/start rippled.bat
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "Makefile",
     "Gulpfile.js"
   ],
-  "main": "src/js/ripple",
+  "main": "src/",
   "directories": {
     "test": "test"
   },
@@ -47,11 +47,11 @@
     "yargs": "~1.3.1"
   },
   "scripts": {
-    "build": "node_modules/.bin/gulp",
+    "build": "gulp",
     "postinstall": "cd node_modules/sjcl; ./configure --with-all --compress=none; make",
-    "test": "./node_modules/.bin/istanbul test -x build/sjcl.js -x src/js/jsbn/* ./node_modules/mocha/bin/_mocha -- --reporter ${MOCHA_REPORTER:=spec} --timeout 10000 --slow 500 test/*-test.js",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
-    "lint": "if ! [ -f eslintrc ]; then curl -o eslintrc 'https://raw.githubusercontent.com/ripple/javascript-style-guide/master/eslintrc'; fi; eslint --reset -c eslintrc src/js/ripple/*.js",
+    "test": "istanbul test _mocha",
+    "coveralls": "cat ./coverage/lcov.info | coveralls",
+    "lint": "if ! [ -f eslintrc ]; then curl -o eslintrc 'https://raw.githubusercontent.com/ripple/javascript-style-guide/master/eslintrc'; fi; eslint --reset -c eslintrc src/*.js",
     "perf": "./scripts/perf_test.sh"
   },
   "repository": {

diff --git a/bench/modpow.js → scripts/modpow.js b/bench/modpow.js → scripts/modpow.js
diff --git a/src/js/ripple/account.js → src/account.js b/src/js/ripple/account.js → src/account.js
diff --git a/src/js/ripple/amount.js → src/amount.js b/src/js/ripple/amount.js → src/amount.js
diff --git a/src/js/ripple/autobridgecalculator.js → src/autobridgecalculator.js b/src/js/ripple/autobridgecalculator.js → src/autobridgecalculator.js
diff --git a/src/js/ripple/base.js → src/base.js b/src/js/ripple/base.js → src/base.js
diff --git a/src/js/ripple/baseconverter.js → src/baseconverter.js b/src/js/ripple/baseconverter.js → src/baseconverter.js
diff --git a/src/js/ripple/binformat.js → src/binformat.js b/src/js/ripple/binformat.js → src/binformat.js
diff --git a/src/cpp/TransactionErr.cpp b/src/cpp/TransactionErr.cpp
diff --git a/src/cpp/TransactionErr.h b/src/cpp/TransactionErr.h
diff --git a/src/js/ripple/currency.js → src/currency.js b/src/js/ripple/currency.js → src/currency.js
diff --git a/src/js/ripple/hashprefixes.js → src/hashprefixes.js b/src/js/ripple/hashprefixes.js → src/hashprefixes.js
diff --git a/src/js/ripple/ieee754.js → src/ieee754.js b/src/js/ripple/ieee754.js → src/ieee754.js
diff --git a/src/js/ripple/index.js → src/index.js b/src/js/ripple/index.js → src/index.js
@@ -22,6 +22,11 @@ exports.TransactionQueue = require('./transactionqueue').TransactionQueue;
 exports.RangeSet = require('./rangeset').RangeSet;
 exports.convertBase = require('./baseconverter');
 
+exports._test = {
+  PathFind: require('./pathfind').PathFind,
+  TransactionManager: require('./transactionmanager').TransactionManager
+};
+
 // Important: We do not guarantee any specific version of SJCL or for any
 // specific features to be included. The version and configuration may change at
 // any time without warning.

diff --git a/src/js/ripple/keypair.js → src/keypair.js b/src/js/ripple/keypair.js → src/keypair.js
diff --git a/src/js/ripple/ledger.js → src/ledger.js b/src/js/ripple/ledger.js → src/ledger.js
diff --git a/src/js/ripple/ledgerspaces.js → src/ledgerspaces.js b/src/js/ripple/ledgerspaces.js → src/ledgerspaces.js
diff --git a/src/js/ripple/log.js → src/log.js b/src/js/ripple/log.js → src/log.js
diff --git a/src/js/ripple/message.js → src/message.js b/src/js/ripple/message.js → src/message.js
diff --git a/src/js/ripple/meta.js → src/meta.js b/src/js/ripple/meta.js → src/meta.js
diff --git a/src/js/ripple/orderbook.js → src/orderbook.js b/src/js/ripple/orderbook.js → src/orderbook.js
diff --git a/src/js/ripple/orderbookutils.js → src/orderbookutils.js b/src/js/ripple/orderbookutils.js → src/orderbookutils.js
diff --git a/src/js/ripple/pathfind.js → src/pathfind.js b/src/js/ripple/pathfind.js → src/pathfind.js
diff --git a/src/js/ripple/rangeset.js → src/rangeset.js b/src/js/ripple/rangeset.js → src/rangeset.js
diff --git a/src/js/ripple/remote.js → src/remote.js b/src/js/ripple/remote.js → src/remote.js
diff --git a/src/js/ripple/request.js → src/request.js b/src/js/ripple/request.js → src/request.js
diff --git a/src/js/ripple/rippleerror.js → src/rippleerror.js b/src/js/ripple/rippleerror.js → src/rippleerror.js
diff --git a/src/js/ripple/seed.js → src/seed.js b/src/js/ripple/seed.js → src/seed.js
diff --git a/src/js/ripple/serializedobject.js → src/serializedobject.js b/src/js/ripple/serializedobject.js → src/serializedobject.js
diff --git a/src/js/ripple/serializedtypes.js → src/serializedtypes.js b/src/js/ripple/serializedtypes.js → src/serializedtypes.js
diff --git a/src/js/ripple/server.js → src/server.js b/src/js/ripple/server.js → src/server.js
diff --git a/src/js/ripple/shamap.js → src/shamap.js b/src/js/ripple/shamap.js → src/shamap.js
diff --git a/src/js/sjcl-custom/index.js → src/sjcl-custom/index.js b/src/js/sjcl-custom/index.js → src/sjcl-custom/index.js
diff --git a/src/js/sjcl-custom/sjcl-ecc-pointextras.js → src/sjcl-custom/sjcl-ecc-pointextras.js b/src/js/sjcl-custom/sjcl-ecc-pointextras.js → src/sjcl-custom/sjcl-ecc-pointextras.js
diff --git a/src/js/sjcl-custom/sjcl-ecdsa-canonical.js → src/sjcl-custom/sjcl-ecdsa-canonical.js b/src/js/sjcl-custom/sjcl-ecdsa-canonical.js → src/sjcl-custom/sjcl-ecdsa-canonical.js
diff --git a/src/js/sjcl-custom/sjcl-ecdsa-der.js → src/sjcl-custom/sjcl-ecdsa-der.js b/src/js/sjcl-custom/sjcl-ecdsa-der.js → src/sjcl-custom/sjcl-ecdsa-der.js
diff --git a/...custom/sjcl-ecdsa-recoverablepublickey.js → ...custom/sjcl-ecdsa-recoverablepublickey.js b/...custom/sjcl-ecdsa-recoverablepublickey.js → ...custom/sjcl-ecdsa-recoverablepublickey.js
diff --git a/src/js/sjcl-custom/sjcl-extramath.js → src/sjcl-custom/sjcl-extramath.js b/src/js/sjcl-custom/sjcl-extramath.js → src/sjcl-custom/sjcl-extramath.js
diff --git a/src/js/sjcl-custom/sjcl-jacobi.js → src/sjcl-custom/sjcl-jacobi.js b/src/js/sjcl-custom/sjcl-jacobi.js → src/sjcl-custom/sjcl-jacobi.js
diff --git a/src/js/sjcl-custom/sjcl-montgomery.js → src/sjcl-custom/sjcl-montgomery.js b/src/js/sjcl-custom/sjcl-montgomery.js → src/sjcl-custom/sjcl-montgomery.js
diff --git a/src/js/sjcl-custom/sjcl-ripemd160.js → src/sjcl-custom/sjcl-ripemd160.js b/src/js/sjcl-custom/sjcl-ripemd160.js → src/sjcl-custom/sjcl-ripemd160.js
diff --git a/src/js/sjcl-custom/sjcl-secp256k1.js → src/sjcl-custom/sjcl-secp256k1.js b/src/js/sjcl-custom/sjcl-secp256k1.js → src/sjcl-custom/sjcl-secp256k1.js
diff --git a/src/js/sjcl-custom/sjcl-validecc.js → src/sjcl-custom/sjcl-validecc.js b/src/js/sjcl-custom/sjcl-validecc.js → src/sjcl-custom/sjcl-validecc.js
diff --git a/src/js/ripple/transaction.js → src/transaction.js b/src/js/ripple/transaction.js → src/transaction.js
diff --git a/src/js/ripple/transactionmanager.js → src/transactionmanager.js b/src/js/ripple/transactionmanager.js → src/transactionmanager.js
diff --git a/src/js/ripple/transactionqueue.js → src/transactionqueue.js b/src/js/ripple/transactionqueue.js → src/transactionqueue.js
diff --git a/src/js/ripple/uint.js → src/uint.js b/src/js/ripple/uint.js → src/uint.js
diff --git a/src/js/ripple/uint128.js → src/uint128.js b/src/js/ripple/uint128.js → src/uint128.js
diff --git a/src/js/ripple/uint160.js → src/uint160.js b/src/js/ripple/uint160.js → src/uint160.js
diff --git a/src/js/ripple/uint256.js → src/uint256.js b/src/js/ripple/uint256.js → src/uint256.js
diff --git a/src/js/ripple/utils.js → src/utils.js b/src/js/ripple/utils.js → src/utils.js
@@ -158,6 +158,6 @@ exports.fromTimestamp = fromTimestamp;
 exports.getMantissaDecimalString = getMantissaDecimalString;
 
 exports.sjcl = require('sjcl');
-require('../sjcl-custom');
+require('./sjcl-custom');
 
 // vim:sw=2:sts=2:ts=8:et
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -0,0 +1 @@
+--reporter spec --timeout 10000 --slow 500