lib: embed simplistic assert library into code

indutny · Jan 12, 2015 · 1ac6e48 · 1ac6e48
1 parent aaf1488
commit 1ac6e48
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 11 deletions.
diff --git a/lib/elliptic/curve/base.js b/lib/elliptic/curve/base.js
@@ -1,9 +1,9 @@
-var assert = require('assert');
 var bn = require('bn.js');
 var elliptic = require('../../elliptic');
 
 var getNAF = elliptic.utils.getNAF;
 var getJSF = elliptic.utils.getJSF;
+var assert = elliptic.utils.assert;
 
 function BaseCurve(type, conf) {
   this.type = type;

diff --git a/lib/elliptic/curve/edwards.js b/lib/elliptic/curve/edwards.js
@@ -1,11 +1,11 @@
-var assert = require('assert');
 var curve = require('../curve');
 var elliptic = require('../../elliptic');
 var bn = require('bn.js');
 var inherits = require('inherits');
 var Base = curve.base;
 
 var getNAF = elliptic.utils.getNAF;
+var assert = elliptic.utils.assert;
 
 function EdwardsCurve(conf) {
   // NOTE: Important as we are creating point in Base.call()

diff --git a/lib/elliptic/curve/mont.js b/lib/elliptic/curve/mont.js
@@ -1,11 +1,11 @@
-var assert = require('assert');
 var curve = require('../curve');
 var elliptic = require('../../elliptic');
 var bn = require('bn.js');
 var inherits = require('inherits');
 var Base = curve.base;
 
 var getNAF = elliptic.utils.getNAF;
+var assert = elliptic.utils.assert;
 
 function MontCurve(conf) {
   Base.call(this, 'mont', conf);

diff --git a/lib/elliptic/curve/short.js b/lib/elliptic/curve/short.js
@@ -1,11 +1,11 @@
-var assert = require('assert');
 var curve = require('../curve');
 var elliptic = require('../../elliptic');
 var bn = require('bn.js');
 var inherits = require('inherits');
 var Base = curve.base;
 
 var getNAF = elliptic.utils.getNAF;
+var assert = elliptic.utils.assert;
 
 function ShortCurve(conf) {
   Base.call(this, 'short', conf);

diff --git a/lib/elliptic/curves.js b/lib/elliptic/curves.js
@@ -1,10 +1,11 @@
 var curves = exports;
 
-var assert = require('assert');
 var hash = require('hash.js');
 var bn = require('bn.js');
 var elliptic = require('../elliptic');
 
+var assert = elliptic.utils.assert;
+
 function PresetCurve(options) {
   if (options.type === 'short')
     this.curve = new elliptic.curve.short(options);

diff --git a/lib/elliptic/ec/index.js b/lib/elliptic/ec/index.js
@@ -1,7 +1,7 @@
-var assert = require('assert');
 var bn = require('bn.js');
 var elliptic = require('../../elliptic');
 var utils = elliptic.utils;
+var assert = utils.assert;
 
 var KeyPair = require('./key');
 var Signature = require('./signature');

diff --git a/lib/elliptic/ec/key.js b/lib/elliptic/ec/key.js
@@ -1,8 +1,8 @@
-var assert = require('assert');
 var bn = require('bn.js');
 
 var elliptic = require('../../elliptic');
 var utils = elliptic.utils;
+var assert = utils.assert;
 
 function KeyPair(ec, priv, pub) {
   if (priv instanceof KeyPair)

diff --git a/lib/elliptic/ec/signature.js b/lib/elliptic/ec/signature.js
@@ -1,8 +1,8 @@
-var assert = require('assert');
 var bn = require('bn.js');
 
 var elliptic = require('../../elliptic');
 var utils = elliptic.utils;
+var assert = utils.assert;
 
 function Signature(r, s) {
   if (r instanceof Signature)

diff --git a/lib/elliptic/hmac-drbg.js b/lib/elliptic/hmac-drbg.js
@@ -1,8 +1,7 @@
-var assert = require('assert');
-
 var hash = require('hash.js');
 var elliptic = require('../elliptic');
 var utils = elliptic.utils;
+var assert = utils.assert;
 
 function HmacDRBG(options) {
   if (!(this instanceof HmacDRBG))

diff --git a/lib/elliptic/utils.js b/lib/elliptic/utils.js
@@ -1,8 +1,12 @@
-var assert = require('assert');
 var bn = require('bn.js');
 
 var utils = exports;
 
+utils.assert = function assert(val, msg) {
+  if (!val)
+    throw new Error(msg || 'Assertion failed');
+};
+
 function toArray(msg, enc) {
   if (Array.isArray(msg))
     return msg.slice();