lib: remove node backend.

michalsmiarowski · Jan 24, 2020 · 0ff4ad6 · 0ff4ad6
1 parent 9e3289f
commit 0ff4ad6
Show file tree

Hide file tree

Showing 103 changed files with 1,084 additions and 3,898 deletions.
diff --git a/lib/aead.js b/lib/aead.js
@@ -6,8 +6,7 @@
 
 'use strict';
 
-try {
-  module.exports = require('./native/aead');
-} catch (e) {
+if (process.env.NODE_BACKEND === 'js')
   module.exports = require('./js/aead');
-}
+else
+  module.exports = require('./native/aead');
diff --git a/lib/aes.js b/lib/aes.js
@@ -6,11 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/aes');
+else
   module.exports = require('./native/aes');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js')
-    module.exports = require('./js/aes');
-  else
-    module.exports = require('./node/aes');
-}
diff --git a/lib/blake2b.js b/lib/blake2b.js
@@ -6,11 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/blake2b');
+else
   module.exports = require('./native/blake2b');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js')
-    module.exports = require('./js/blake2b');
-  else
-    module.exports = require('./node/blake2b');
-}
diff --git a/lib/blake2s.js b/lib/blake2s.js
@@ -6,11 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/blake2s');
+else
   module.exports = require('./native/blake2s');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js')
-    module.exports = require('./js/blake2s');
-  else
-    module.exports = require('./node/blake2s');
-}
diff --git a/lib/bn-browser.js b/lib/bn-browser.js
@@ -6,4 +6,4 @@
 
 'use strict';
 
-module.exports = require('./js/bn.js');
+module.exports = require('./js/bn');
diff --git a/lib/bn.js b/lib/bn.js
@@ -8,10 +8,14 @@
 
 if (process.env.BCRYPTO_FORCE_BIGINT || process.env.NODE_BACKEND !== 'js') {
   try {
-    module.exports = require('./node/bn.js');
+    module.exports = require('./native/bn');
+    // See: https://github.com/bcoin-org/bcrypto/issues/27
+    //      https://github.com/bcoin-org/bcrypto/issues/35
+    if (!module.exports.native)
+      throw new Error();
   } catch (e) {
-    module.exports = require('./js/bn.js');
+    module.exports = require('./js/bn');
   }
 } else {
-  module.exports = require('./js/bn.js');
+  module.exports = require('./js/bn');
 }
diff --git a/lib/chacha20.js b/lib/chacha20.js
@@ -6,8 +6,7 @@
 
 'use strict';
 
-try {
-  module.exports = require('./native/chacha20');
-} catch (e) {
+if (process.env.NODE_BACKEND === 'js')
   module.exports = require('./js/chacha20');
-}
+else
+  module.exports = require('./native/chacha20');
diff --git a/lib/cipher.js b/lib/cipher.js
@@ -6,11 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/cipher');
+else
   module.exports = require('./native/cipher');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js')
-    module.exports = require('./js/cipher');
-  else
-    module.exports = require('./node/cipher');
-}
diff --git a/lib/cleanse.js b/lib/cleanse.js
@@ -6,11 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/cleanse');
+else
   module.exports = require('./native/cleanse');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js')
-    module.exports = require('./js/cleanse');
-  else
-    module.exports = require('./node/cleanse');
-}
diff --git a/lib/dsa.js b/lib/dsa.js
@@ -6,11 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/dsa');
+else
   module.exports = require('./native/dsa');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js')
-    module.exports = require('./js/dsa');
-  else
-    module.exports = require('./node/dsa');
-}
diff --git a/lib/ed25519.js b/lib/ed25519.js
@@ -6,16 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/ed25519');
+else
   module.exports = require('./native/ed25519');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js') {
-    module.exports = require('./js/ed25519');
-  } else {
-    try {
-      module.exports = require('./node/ed25519');
-    } catch (e) {
-      module.exports = require('./js/ed25519');
-    }
-  }
-}
diff --git a/lib/ed448.js b/lib/ed448.js
@@ -6,16 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/ed448');
+else
   module.exports = require('./native/ed448');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js') {
-    module.exports = require('./js/ed448');
-  } else {
-    try {
-      module.exports = require('./node/ed448');
-    } catch (e) {
-      module.exports = require('./js/ed448');
-    }
-  }
-}
diff --git a/lib/encoding/base58.js b/lib/encoding/base58.js
@@ -6,8 +6,7 @@
 
 'use strict';
 
-try {
-  module.exports = require('../native/base58');
-} catch (e) {
+if (process.env.NODE_BACKEND === 'js')
   module.exports = require('../js/base58');
-}
+else
+  module.exports = require('../native/base58');
diff --git a/lib/encoding/bech32.js b/lib/encoding/bech32.js
@@ -6,8 +6,7 @@
 
 'use strict';
 
-try {
-  module.exports = require('../native/bech32');
-} catch (e) {
+if (process.env.NODE_BACKEND === 'js')
   module.exports = require('../js/bech32');
-}
+else
+  module.exports = require('../native/bech32');
diff --git a/lib/encoding/cash32.js b/lib/encoding/cash32.js
@@ -6,8 +6,7 @@
 
 'use strict';
 
-try {
-  module.exports = require('../native/cash32');
-} catch (e) {
+if (process.env.NODE_BACKEND === 'js')
   module.exports = require('../js/cash32');
-}
+else
+  module.exports = require('../native/cash32');
diff --git a/lib/hash160.js b/lib/hash160.js
@@ -6,16 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/hash160');
+else
   module.exports = require('./native/hash160');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js') {
-    module.exports = require('./js/hash160');
-  } else {
-    try {
-      module.exports = require('./node/hash160');
-    } catch (e) {
-      module.exports = require('./js/hash160');
-    }
-  }
-}
diff --git a/lib/hash256.js b/lib/hash256.js
@@ -6,11 +6,7 @@
 
 'use strict';
 
-try {
+if (process.env.NODE_BACKEND === 'js')
+  module.exports = require('./js/hash256');
+else
   module.exports = require('./native/hash256');
-} catch (e) {
-  if (process.env.NODE_BACKEND === 'js')
-    module.exports = require('./js/hash256');
-  else
-    module.exports = require('./node/hash256');
-}
diff --git a/lib/internal/primes.js b/lib/internal/primes.js
@@ -23,7 +23,7 @@
 'use strict';
 
 const assert = require('bsert');
-const BN = require('../bn.js');
+const BN = require('../bn');
 const random = require('../random');
 
 /*

diff --git a/lib/js/dsa.js b/lib/js/dsa.js
@@ -26,7 +26,7 @@
 'use strict';
 
 const assert = require('bsert');
-const BN = require('../bn.js');
+const BN = require('../bn');
 const rng = require('../random');
 const HmacDRBG = require('../hmac-drbg');
 const SHA256 = require('../sha256');

diff --git a/lib/js/ecdsa.js b/lib/js/ecdsa.js
@@ -30,7 +30,7 @@
 'use strict';
 
 const assert = require('bsert');
-const BN = require('../bn.js');
+const BN = require('../bn');
 const rng = require('../random');
 const asn1 = require('../internal/asn1');
 const Schnorr = require('./schnorr-legacy');

diff --git a/lib/js/eddsa.js b/lib/js/eddsa.js
@@ -82,7 +82,7 @@
 
 const assert = require('bsert');
 const elliptic = require('./elliptic');
-const BN = require('../bn.js');
+const BN = require('../bn');
 const ChaCha20 = require('../chacha20');
 const rng = require('../random');
 

diff --git a/lib/js/elliptic.js b/lib/js/elliptic.js
@@ -171,7 +171,7 @@
 'use strict';
 
 const {custom} = require('../internal/custom');
-const BN = require('../bn.js');
+const BN = require('../bn');
 
 /*
  * Constants
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@

		'use strict';

		module.exports = require('./js/bn.js');
		module.exports = require('./js/bn');