Simplify options for EngineConfig

EdgeApp · Dec 19, 2024 · 2d5e4f8 · 2d5e4f8
1 parent 858f870
commit 2d5e4f8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 25 deletions.
diff --git a/src/common/plugin/CurrencyPlugin.ts b/src/common/plugin/CurrencyPlugin.ts
@@ -69,10 +69,9 @@ export function makeCurrencyPlugin(
         currencyTools,
         initOptions: asUtxoInitOptions(initOptions),
         io,
-        options: {
-          ...pluginOptions,
-          ...engineOptions,
-          emitter
+        emitter,
+        engineOptions: {
+          ...engineOptions
         },
         pluginState
       }

diff --git a/src/common/plugin/types.ts b/src/common/plugin/types.ts
@@ -356,16 +356,13 @@ export interface EngineConfig {
   pluginInfo: PluginInfo
   pluginDisklet: Disklet
   currencyTools: EdgeCurrencyTools
-  options: EngineOptions
+  engineOptions: EdgeCurrencyEngineOptions
+  emitter: EngineEmitter
   initOptions: UtxoInitOptions
   io: EdgeIo
   pluginState: PluginState
 }
 
-export interface EngineOptions extends EdgeCurrencyEngineOptions {
-  emitter: EngineEmitter
-}
-
 export type LocalWalletMetadata = ReturnType<typeof asLocalWalletMetadata>
 export const asLocalWalletMetadata = asObject({
   balance: asString,

diff --git a/src/common/utxobased/engine/UtxoEngine.ts b/src/common/utxobased/engine/UtxoEngine.ts
@@ -73,19 +73,14 @@ export async function makeUtxoEngine(
   const {
     pluginInfo,
     pluginDisklet,
-    // Rename to make it explicit that this is sensitive memory
-    options,
+    emitter,
+    engineOptions,
     io,
     pluginState
   } = config
-  const {
-    walletLocalDisklet,
-    walletLocalEncryptedDisklet,
-    emitter,
-    log
-  } = options
+  const { walletLocalDisklet, walletLocalEncryptedDisklet, log } = engineOptions
   const { currencyInfo, engineInfo, coinInfo } = pluginInfo
-  const userSettings = asUtxoUserSettings(options.userSettings)
+  const userSettings = asUtxoUserSettings(engineOptions.userSettings)
 
   // We should move the active server list to the engine state,
   // since multiple accounts can be logged in at once,
@@ -120,7 +115,7 @@ export async function makeUtxoEngine(
     disklet: pluginDisklet,
     pluginInfo,
     io,
-    log: config.options.log
+    log: config.engineOptions.log
   })
 
   const metadata = await makeMetadata({
@@ -983,11 +978,11 @@ export async function makeUtxoEngine(
 
       const tmpEngineProcessor = makeUtxoEngineProcessor({
         ...config,
-        options: {
-          ...config.options,
+        emitter: tmpEmitter,
+        engineOptions: {
+          ...config.engineOptions,
           walletLocalDisklet: tmpDisklet,
-          walletLocalEncryptedDisklet: tmpEncryptedDisklet,
-          emitter: tmpEmitter
+          walletLocalEncryptedDisklet: tmpEncryptedDisklet
         },
         pluginInfo: {
           ...pluginInfo,

diff --git a/src/common/utxobased/engine/UtxoEngineProcessor.ts b/src/common/utxobased/engine/UtxoEngineProcessor.ts
@@ -91,14 +91,15 @@ export function makeUtxoEngineProcessor(
   const {
     initOptions,
     io,
-    options,
+    emitter,
+    engineOptions,
     pluginState,
     pluginInfo,
     dataLayer,
     walletInfo,
     walletTools
   } = config
-  const { emitter, log } = options
+  const { log } = engineOptions
 
   const { walletFormats } = walletInfo.keys