feat(keychain): expose clear method instead of clearing in plugin

ExodusMovement · Jan 23, 2024 · c04181c · c04181c
1 parent d7e3711
commit c04181c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 35 deletions.
diff --git a/features/keychain/index.js b/features/keychain/index.js
@@ -1,25 +1,11 @@
 import memoizedKeychainDefinition from './module/memoized-keychain'
 import keychainDefinition from './module/keychain'
-import keychainPluginDefinition from './plugin'
-
-const storageOpts = {
-  storage: { namespace: 'keychain' },
-}
 
 const keychain = ({ cachePublicKeys }) => {
   return {
     id: 'keychain',
     definitions: cachePublicKeys
-      ? [
-          {
-            definition: memoizedKeychainDefinition,
-            ...storageOpts,
-          },
-          {
-            definition: keychainPluginDefinition,
-            ...storageOpts,
-          },
-        ]
+      ? [{ definition: memoizedKeychainDefinition, storage: { namespace: 'keychain' } }]
       : [{ definition: keychainDefinition }],
   }
 }

diff --git a/features/keychain/module/keychain.js b/features/keychain/module/keychain.js
@@ -126,14 +126,19 @@ export class Keychain extends ExodusModule {
   clone() {
     return new Keychain({ legacyPrivToPub: this.#legacyPrivToPub })
   }
+
+  clear = async () => {
+    // noop
+  }
 }
 
 const createKeychain = (args = {}) => new Keychain({ ...args })
 
-// eslint-disable-next-line @exodus/export-default/named
-export default {
+const keychainDefinition = {
   id: MODULE_ID,
   type: 'module',
   factory: createKeychain,
   dependencies: ['legacyPrivToPub', 'logger'],
 }
+
+export default keychainDefinition
diff --git a/features/keychain/module/memoized-keychain.js b/features/keychain/module/memoized-keychain.js
@@ -14,6 +14,7 @@ class MemoizedKeychain extends Keychain {
   #storage
   #publicKeys = {}
   #cloneOpts
+
   constructor({ storage, logger }) {
     super({ id: MODULE_ID, logger })
 
@@ -49,12 +50,15 @@ class MemoizedKeychain extends Keychain {
   }
 
   clone = () => new MemoizedKeychain(this.#cloneOpts)
+
+  clear = async () => this.#storage.delete(CACHE_KEY)
 }
 
-// eslint-disable-next-line @exodus/export-default/named
-export default {
+const memoizedKeychainDefinition = {
   id: 'keychain',
   type: 'module',
   factory: (opts) => new MemoizedKeychain(opts),
   dependencies: ['storage', 'logger'],
 }
+
+export default memoizedKeychainDefinition
diff --git a/features/keychain/package.json b/features/keychain/package.json
@@ -13,7 +13,6 @@
     "index.js",
     "atoms",
     "module",
-    "plugin",
     "README.md",
     "CHANGELOG.md",
     "!**/__tests__/**"

diff --git a/features/keychain/plugin/index.js b/features/keychain/plugin/index.js