Simplified build process; added in-browser test script

bitbill · Apr 22, 2017 · 904007a · 904007a
1 parent cdfece3
commit 904007a
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ test/fixtures/extra
 test/fixtures/state
 test/fixtures/nodes
 test/fixtures/geth
+test/browser/bundle.js
diff --git a/dist/keythereum.js b/dist/keythereum.js
@@ -7,7 +7,7 @@ global.keythereum = keythereum;
 },{"./":2}],2:[function(require,module,exports){
 (function (process,Buffer){
 /**
- * keythereum: create/import/export ethereum keys
+ * Create, import, and export ethereum keys.
  * @author Jack Peterson ([email protected])
  */
 
@@ -28878,7 +28878,7 @@ function HmacDRBG(options) {
   this.outLen = this.hash.outSize;
   this.minEntropy = options.minEntropy || this.hash.hmacStrength;
 
-  this.reseed = null;
+  this._reseed = null;
   this.reseedInterval = null;
   this.K = null;
   this.V = null;
@@ -28903,7 +28903,7 @@ HmacDRBG.prototype._init = function init(entropy, nonce, pers) {
   }
 
   this._update(seed);
-  this.reseed = 1;
+  this._reseed = 1;
   this.reseedInterval = 0x1000000000000;  // 2^48
 };
 
@@ -28945,11 +28945,11 @@ HmacDRBG.prototype.reseed = function reseed(entropy, entropyEnc, add, addEnc) {
          'Not enough entropy. Minimum is: ' + this.minEntropy + ' bits');
 
   this._update(entropy.concat(add || []));
-  this.reseed = 1;
+  this._reseed = 1;
 };
 
 HmacDRBG.prototype.generate = function generate(len, enc, add, addEnc) {
-  if (this.reseed > this.reseedInterval)
+  if (this._reseed > this.reseedInterval)
     throw new Error('Reseed is required');
 
   // Optional encoding
@@ -28973,7 +28973,7 @@ HmacDRBG.prototype.generate = function generate(len, enc, add, addEnc) {
 
   var res = temp.slice(0, len);
   this._update(add);
-  this.reseed++;
+  this._reseed++;
   return utils.encode(res, enc);
 };
 

diff --git a/dist/keythereum.min.js b/dist/keythereum.min.js
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 /**
- * keythereum: create/import/export ethereum keys
+ * Create, import, and export ethereum keys.
  * @author Jack Peterson ([email protected])
  */
 

diff --git a/package.json b/package.json
@@ -10,8 +10,10 @@
   "scripts": {
     "test": "mocha test/keys.js",
     "geth": "mocha -R progress test/keys.js && mocha -R progress test/geth.js",
-    "lint": "eslint index.js && eslint gulpfile.js && eslint test",
-    "coverage": "istanbul cover -x **/lib/** ./node_modules/mocha/bin/_mocha test/keys.js"
+    "lint": "eslint index.js && eslint gulpfile.js && eslint test/*.js",
+    "coverage": "istanbul cover -x **/lib/** ./node_modules/mocha/bin/_mocha test/keys.js",
+    "build": "browserify ./exports.js > ./dist/keythereum.js && uglifyjs ./dist/keythereum.js > ./dist/keythereum.min.js",
+    "build:tests": "browserify test/keys.js > test/browser/bundle.js"
   },
   "repository": {
     "type": "git",
@@ -37,10 +39,8 @@
     "browserify": "^13.1.1",
     "chai": "^3.2.0",
     "coveralls": "^2.11.3",
-    "del": "^1.2.0",
     "eslint": "^3.17.1",
     "geth": "^0.2.2",
-    "gulp": "^3.9.0",
     "istanbul": "^0.3.17",
     "mocha": "^2.2.5",
     "uglify-js": "^2.4.24",

diff --git a/test/browser/index.html b/test/browser/index.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <meta charset="utf-8">
-  <title>keythereum</title>
-  <script>
-    window.logger = function (o) {
-      console.log(JSON.stringify(o, null, 2));
-    };
-  </script>
-</head>
-<body>
-  <script src="../../dist/keythereum.js"></script>
-</body>
+  <head>
+    <title>keythereum tests</title>
+    <link rel="stylesheet" href="../../node_modules/mocha/mocha.css">
+  </head>
+  <body>
+    <div id="mocha"></div>
+    <script src="../../node_modules/mocha/mocha.js"></script>
+    <script src="../../node_modules/chai/chai.js"></script>
+    <script>mocha.setup("bdd")</script>
+    <script src="./bundle.js"></script>
+    <script>mocha.run();</script>
+  </body>
 </html>
diff --git a/test/keys.js b/test/keys.js
@@ -788,7 +788,11 @@ describe("Generate keystore filename", function () {
 
 describe("Export to file", function () {
 
-  var keyObj = {
+  var keyObj;
+
+  if (keythereum.browser) return;
+
+  keyObj = {
     address: "008aeeda4d805471df9b2a5b0f38a0c3bcba786b",
     crypto: {
       cipher: "aes-128-ctr",
@@ -855,7 +859,9 @@ describe("Export to file", function () {
 
 describe("Import from keystore file", function () {
 
-  var test = function (t) {
+  if (keythereum.browser) return;
+
+  function test(t) {
     var label = "[" + t.expected.crypto.kdf + "] import " + t.input.address + " from file";
     it(label, function (done) {
       var keyObject;
@@ -869,7 +875,7 @@ describe("Import from keystore file", function () {
         done();
       });
     });
-  };
+  }
 
   describe("Version 3", function () {
     test({