Fix tests and build scripts

Author: alcuadrado

packages/ethereum-cryptography/package.json

@@ -78,7 +78,7 @@
     "elliptic-secp256k1:build": "rollup -c elliptic-secp256k1-config/rollup.config.js",
     "elliptic-secp256k1:copy": "mkdir -p vendor && cp src/vendor/elliptic-secp256k1.js ./vendor",
     "scryptsy-without-crypto:build": "bash -x scripts/build-scryptsy-without-crypto.sh",
-    "scryptsy-without-crypto:copy": "mkdir -p vendor pure/vendor && cp src/vendor/scryptsy-without-crypto.js ./vendor && cp src/pure/vendor/scryptsy-without-crypto.js ./pure/vendor",
+    "scryptsy-without-crypto:copy": "mkdir -p vendor && cp src/vendor/scryptsy-without-crypto.js ./vendor",
     "hdkey-without-crypto:build": "bash -x scripts/build-hdkey-without-crypto.sh",
     "hdkey-without-crypto:copy": "mkdir -p vendor pure/vendor && cp src/vendor/hdkey-without-crypto.js ./vendor && cp src/pure/vendor/hdkey-without-crypto.js ./pure/vendor",
     "bip39-without-wordlists:build": "bash -x scripts/build-bip39-without-wordlists.sh",

packages/ethereum-cryptography/scripts/build-browser-tests.sh

@@ -10,9 +10,8 @@ cp src/vendor/elliptic-secp256k1.js test-builds/tsc/src/vendor
 
 echo "Building scryptsy-without-crypto"
 npm run scryptsy-without-crypto:build
-mkdir -p test-builds/tsc/src/vendor test-builds/tsc/src/pure/vendor
+mkdir -p test-builds/tsc/src/vendor
 cp src/vendor/scryptsy-without-crypto.js test-builds/tsc/src/vendor
-cp src/pure/vendor/scryptsy-without-crypto.js test-builds/tsc/src/pure/vendor
 
 echo "Building hdkey-without-crypto"
 npm run hdkey-without-crypto:build

packages/ethereum-cryptography/scripts/build-scryptsy-without-crypto.sh

@@ -8,4 +8,3 @@ npx tsc --allowJs --esModuleInterop ./scryptsy-without-crypto-build/rollup/scryp
 
 echo "Copying output"
 cp scryptsy-without-crypto-build/scryptsy-without-crypto.js ./src/vendor
-cp scryptsy-without-crypto-build/scryptsy-without-crypto.js ./src/pure/vendor

packages/ethereum-cryptography/src/pure/scrypt.ts

@@ -1,5 +1,5 @@
 import "setimmediate";
-const scryptsy = require("./vendor/scryptsy-without-crypto");
+const scryptsy = require("../vendor/scryptsy-without-crypto");
 
 export function scrypt(
   password: Buffer,

packages/ethereum-cryptography/src/scrypt.ts

@@ -6,35 +6,7 @@ try {
   // tslint:disable-next-line no-implicit-dependencies
   scryptModule = require("ethereum-cryptography-native/scrypt");
 } catch {
-  // This module is slightly more complicated, as we don't want to use the
-  // 100% pure version of scrypt if the native one isn't installed.
-
-  // We require this local version of scryptsy-without-crypto because it uses
-  // the built-in implementation of pbkdf2
-  const scryptsy = require("./vendor/scryptsy-without-crypto");
-
-  scryptModule = {
-    scrypt(
-      password: Buffer,
-      salt: Buffer,
-      n: number,
-      p: number,
-      r: number,
-      dklen: number
-    ): Promise<Buffer> {
-      return scryptsy.async(password, salt, n, r, p, dklen);
-    },
-    scryptSync(
-      password: Buffer,
-      salt: Buffer,
-      n: number,
-      p: number,
-      r: number,
-      dklen: number
-    ): Buffer {
-      return scryptsy(password, salt, n, r, p, dklen);
-    }
-  };
+  scryptModule = scryptPure;
 }
 
 export const scrypt = scryptModule.scrypt;