From 1f74c1e30e5de29a9887e2ad999992f29e7b0300 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 22 Dec 2012 14:07:42 -0800 Subject: [PATCH 1/4] Remove redundant set, log before assert. --- src/cpp/ripple/LedgerEntrySet.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cpp/ripple/LedgerEntrySet.cpp b/src/cpp/ripple/LedgerEntrySet.cpp index 4d560750d..7fe09927c 100644 --- a/src/cpp/ripple/LedgerEntrySet.cpp +++ b/src/cpp/ripple/LedgerEntrySet.cpp @@ -626,12 +626,11 @@ TER LedgerEntrySet::dirDelete( uint64 uNodeCur = uNodeDir; SLE::pointer sleNode = entryCache(ltDIR_NODE, uNodeCur ? Ledger::getDirNodeIndex(uRootIndex, uNodeCur) : uRootIndex); - assert(sleNode); - if (!sleNode) { cLog(lsWARNING) << "dirDelete: no such node"; + assert(false); return tefBAD_LEDGER; } From f0ee9e6cbf94d4a98ccc0ff59e062eb124e283a0 Mon Sep 17 00:00:00 2001 From: Stefan Thomas Date: Thu, 20 Dec 2012 12:38:29 -0800 Subject: [PATCH 2/4] New build system for SJCL. --- grunt.js | 41 +++++++++++++++++++++++++++++++++++++++++ src/js/amount.js | 4 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 grunt.js diff --git a/grunt.js b/grunt.js new file mode 100644 index 000000000..b96db799f --- /dev/null +++ b/grunt.js @@ -0,0 +1,41 @@ +module.exports = function(grunt) { + grunt.initConfig({ + pkg: ' - v<%= pkg.version %> - ' + + '<%= grunt.template.today("yyyy-mm-dd") %>\n' + + '<%= pkg.homepage ? "* " + pkg.homepage + "\n" : "" %>' + + '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' + + ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */' + }, + concat: { + sjcl: { + src: [ + "src/js/sjcl/core/sjcl.js", +// "src/js/sjcl/core/aes.js", + "src/js/sjcl/core/bitArray.js", + "src/js/sjcl/core/codecString.js", + "src/js/sjcl/core/codecHex.js", + "src/js/sjcl/core/codecBase64.js", + "src/js/sjcl/core/codecBytes.js", + "src/js/sjcl/core/sha256.js", + "src/js/sjcl/core/sha1.js", +// "src/js/sjcl/core/ccm.js", +// "src/js/sjcl/core/cbc.js", +// "src/js/sjcl/core/ocb2.js", +// "src/js/sjcl/core/hmac.js", +// "src/js/sjcl/core/pbkdf2.js", + "src/js/sjcl/core/random.js", + "src/js/sjcl/core/convenience.js", + "src/js/sjcl/core/bn.js", + "src/js/sjcl/core/ecc.js", + "src/js/sjcl/core/srp.js" + ], + dest: 'build/sjcl.js' + } + }, + }); + + // Tasks + grunt.registerTask('default', 'concat:sjcl'); +}; diff --git a/src/js/amount.js b/src/js/amount.js index cdd3c322c..489fbc240 100644 --- a/src/js/amount.js +++ b/src/js/amount.js @@ -1,8 +1,8 @@ // Represent Ripple amounts and currencies. // - Numbers in hex are big-endian. -var sjcl = require('./sjcl/core.js'); -var bn = require('./sjcl/core.js').bn; +var sjcl = require('../../build/sjcl'); +var bn = sjcl.bn; var utils = require('./utils.js'); var jsbn = require('./jsbn.js'); From f00a82a554304a9fffe6b8267c7c45b7b7a39bc0 Mon Sep 17 00:00:00 2001 From: Stefan Thomas Date: Thu, 20 Dec 2012 12:45:53 -0800 Subject: [PATCH 3/4] The command "grunt" now builds everything. Switched webpack build over to grunt. --- grunt.js | 20 +++++++++++++++- package.json | 2 +- webpack.js | 68 ---------------------------------------------------- 3 files changed, 20 insertions(+), 70 deletions(-) delete mode 100644 webpack.js diff --git a/grunt.js b/grunt.js index b96db799f..273215e08 100644 --- a/grunt.js +++ b/grunt.js @@ -1,4 +1,6 @@ module.exports = function(grunt) { + grunt.loadNpmTasks('grunt-webpack'); + grunt.initConfig({ pkg: '.js" + }, + lib_debug: { + src: "src/js/index.js", + dest: "build/ripple-<%= pkg.version %>.js", + debug: true + }, + lib_min: { + src: "src/js/index.js", + dest: "build/ripple-<%= pkg.version %>.js", + minimize: true + } + } }); // Tasks - grunt.registerTask('default', 'concat:sjcl'); + grunt.registerTask('default', 'concat:sjcl webpack'); }; diff --git a/package.json b/package.json index 2ec474aab..00f345360 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "buster": "~0.6.2", - "webpack": "~0.7.17" + "grunt-webpack": "~0.4.0" }, "scripts": { "test": "buster test" diff --git a/webpack.js b/webpack.js deleted file mode 100644 index 6f50aaf5d..000000000 --- a/webpack.js +++ /dev/null @@ -1,68 +0,0 @@ -var pkg = require('./package.json'); -var webpack = require("webpack"); -var async = require("async"); -var extend = require("extend"); - -var cfg = { - // General settings - baseName: pkg.name, - programPath: __dirname + "/src/js/index.js", - - // CLI-configurable options - watch: false, - outputDir: __dirname + "/build" -}; -for (var i = 0, l = process.argv.length; i < l; i++) { - var arg = process.argv[i]; - if (arg === '-w' || arg === '--watch') { - cfg.watch = true; - } else if (arg === '-o') { - cfg.outputDir = process.argv[++i]; - } -}; - -var builds = [{ - filename: 'ripple-'+pkg.version+'.js', -},{ - filename: 'ripple-'+pkg.version+'-debug.js', - debug: true -},{ - filename: 'ripple-'+pkg.version+'-min.js', - minimize: true -}]; - -var defaultOpts = { - // [sic] Yes, this is the spelling upstream. - libary: 'ripple', - // However, it's fixed in webpack 0.8, so we include the correct spelling too: - library: 'ripple', - watch: cfg.watch -}; - -function build(opts) { - var opts = extend({}, defaultOpts, opts); - opts.output = cfg.outputDir + "/"+opts.filename; - return function (callback) { - var filename = opts.filename; - webpack(cfg.programPath, opts, function (err, result) { - console.log(' '+filename, result.hash, '['+result.modulesCount+']'); - if ("function" === typeof callback) { - callback(err); - } - }); - } -} - -if (!cfg.watch) { - console.log('Compiling Ripple JavaScript...'); - async.series(builds.map(build), function (err) { - if (err) { - console.error(err); - } - }); -} else { - console.log('Watching files for changes...'); - builds.map(build).forEach(function (build) { - build(); - }); -} From a9149e71e872e32cbe102454ba5890d920384bb3 Mon Sep 17 00:00:00 2001 From: Stefan Thomas Date: Sun, 23 Dec 2012 00:48:41 +0100 Subject: [PATCH 4/4] Add watch task (automatic recompilation). --- grunt.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/grunt.js b/grunt.js index 273215e08..4b9fd1294 100644 --- a/grunt.js +++ b/grunt.js @@ -51,6 +51,16 @@ module.exports = function(grunt) { dest: "build/ripple-<%= pkg.version %>.js", minimize: true } + }, + watch: { + sjcl: { + files: [''], + tasks: 'concat:sjcl' + }, + lib: { + files: 'src/js/*.js', + tasks: 'webpack' + } } });