refactor scryptsy into jellyfish-wallet-encrypted/test (#516)

* move Scryptsy to dev dep * refactor simple scryptsy implementation into test, prevent main package bundling include it
DeFiCh · Jul 29, 2021 · 053839f · 053839f
1 parent 956f990
commit 053839f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 56 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/...t-encrypted/src/provider/scrypt_simple.ts → ...let-encrypted/__tests__/SimpleScryptsy.ts b/...t-encrypted/src/provider/scrypt_simple.ts → ...let-encrypted/__tests__/SimpleScryptsy.ts
@@ -1,5 +1,5 @@
 import scrypt from 'scryptsy'
-import { ScryptProvider } from './scrypt_provider'
+import { ScryptProvider } from '../src/provider/scrypt_provider'
 
 export interface ScryptParams {
   N: number
@@ -13,13 +13,6 @@ const DEFAULT_SCRYPT_PARAMS: ScryptParams = {
   p: 8
 }
 
-/**
- * A simple ScryptProvider implementation using
- * {@link https://www.npmjs.com/package/scryptsy} (Javascript implementation of the scrypt key derivation)
- *
- * Mainly for testing and prototyping purpose
- * Scryptsy library may not compatible with other platforms, eg: react-native
- */
 export class SimpleScryptsy implements ScryptProvider {
   constructor (private readonly params: ScryptParams = DEFAULT_SCRYPT_PARAMS) {
   }

diff --git a/packages/jellyfish-wallet-encrypted/__tests__/bip32.test.ts b/packages/jellyfish-wallet-encrypted/__tests__/bip32.test.ts
@@ -1,8 +1,9 @@
 import BigNumber from 'bignumber.js'
-import { EncryptedHdNodeProvider, EncryptedMnemonicHdNode, Scrypt, SimpleScryptsy } from '../src'
+import { EncryptedHdNodeProvider, EncryptedMnemonicHdNode, Scrypt } from '../src'
 import { MnemonicHdNode, MnemonicHdNodeProvider } from '@defichain/jellyfish-wallet-mnemonic'
 import { OP_CODES, Transaction, Vout } from '@defichain/jellyfish-transaction'
 import { HASH160 } from '@defichain/jellyfish-crypto'
+import { SimpleScryptsy } from './SimpleScryptsy'
 
 const regTestBip32Options = {
   bip32: {

diff --git a/packages/jellyfish-wallet-encrypted/__tests__/provider/scrypt_simple.test.ts b/packages/jellyfish-wallet-encrypted/__tests__/provider/scrypt_simple.test.ts
diff --git a/packages/jellyfish-wallet-encrypted/__tests__/scrypt.test.ts b/packages/jellyfish-wallet-encrypted/__tests__/scrypt.test.ts
@@ -1,4 +1,5 @@
-import { Scrypt, SimpleScryptsy } from '../src'
+import { Scrypt } from '../src'
+import { SimpleScryptsy } from './SimpleScryptsy'
 
 const scrypt = new Scrypt(new SimpleScryptsy())
 

diff --git a/packages/jellyfish-wallet-encrypted/package.json b/packages/jellyfish-wallet-encrypted/package.json
@@ -35,10 +35,10 @@
     "build": "tsc -b ./tsconfig.build.json"
   },
   "dependencies": {
-    "@defichain/jellyfish-wallet-mnemonic": "0.0.0",
-    "scryptsy": "^2.1.0"
+    "@defichain/jellyfish-wallet-mnemonic": "0.0.0"
   },
   "devDependencies": {
+    "scryptsy": "^2.1.0",
     "@types/scryptsy": "^2.0.0"
   }
 }
diff --git a/packages/jellyfish-wallet-encrypted/src/index.ts b/packages/jellyfish-wallet-encrypted/src/index.ts
@@ -1,4 +1,3 @@
 export * from './hd_node'
 export * from './provider/scrypt_provider'
-export * from './provider/scrypt_simple'
 export * from './scrypt'