moved copyGossipKeysToStaging from node.mjs to key_manager.mjs

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/commands/node.mjs

@@ -456,7 +456,7 @@ export class NodeCommand extends BaseCommand {
     return subTasks
   }
 
-  // TODO: move to KeyManager
+  // TODO: duplicate into network deploy
   async initializeSetup (config, k8) {
     // compute other config parameters
     config.keysDir = path.join(validatePath(config.cacheDir), 'keys')
@@ -781,7 +781,7 @@ export class NodeCommand extends BaseCommand {
               title: 'Copy Gossip keys to staging',
               task: async (ctx, _) => {
                 const config = /** @type {NodeSetupConfigClass} **/ ctx.config
-                await this.copyGossipKeysToStaging(config.keyFormat, config.keysDir, config.stagingKeysDir, ctx.config.nodeIds)
+                await this.keyManager.copyGossipKeysToStaging(config.keyFormat, config.keysDir, config.stagingKeysDir, ctx.config.nodeIds)
               }
             },
             {
@@ -1868,7 +1868,7 @@ export class NodeCommand extends BaseCommand {
               task: async (ctx, _) => {
                 const config = /** @type {NodeAddConfigClass} **/ ctx.config
 
-                await this.copyGossipKeysToStaging(config.keyFormat, config.keysDir, config.stagingKeysDir, config.allNodeIds)
+                await this.keyManager.copyGossipKeysToStaging(config.keyFormat, config.keysDir, config.stagingKeysDir, config.allNodeIds)
               }
             },
             {
@@ -2133,34 +2133,6 @@ export class NodeCommand extends BaseCommand {
     }
   }
 
-  // TODO: move to KeyManager
-  async copyGossipKeysToStaging (keyFormat, keysDir, stagingKeysDir, nodeIds) {
-    // copy gossip keys to the staging
-    for (const nodeId of nodeIds) {
-      switch (keyFormat) {
-        case constants.KEY_FORMAT_PEM: {
-          const signingKeyFiles = this.keyManager.prepareNodeKeyFilePaths(nodeId, keysDir, constants.SIGNING_KEY_PREFIX)
-          await this.keyManager.copyNodeKeysToStaging(signingKeyFiles, stagingKeysDir)
-
-          // generate missing agreement keys
-          const agreementKeyFiles = this.keyManager.prepareNodeKeyFilePaths(nodeId, keysDir, constants.AGREEMENT_KEY_PREFIX)
-          await this.keyManager.copyNodeKeysToStaging(agreementKeyFiles, stagingKeysDir)
-          break
-        }
-
-        case constants.KEY_FORMAT_PFX: {
-          const privateKeyFile = Templates.renderGossipPfxPrivateKeyFile(nodeId)
-          fs.cpSync(path.join(keysDir, privateKeyFile), path.join(stagingKeysDir, privateKeyFile))
-          fs.cpSync(path.join(keysDir, constants.PUBLIC_PFX), path.join(stagingKeysDir, constants.PUBLIC_PFX))
-          break
-        }
-
-        default:
-          throw new FullstackTestingError(`Unsupported key-format ${keyFormat}`)
-      }
-    }
-  }
-
   // Command Definition
   /**
    * Return Yargs command definition for 'node' command

src/core/key_manager.mjs

@@ -677,4 +677,31 @@ export class KeyManager {
       fs.cpSync(keyFile, path.join(destDir, fileName))
     }
   }
+
+  async copyGossipKeysToStaging (keyFormat, keysDir, stagingKeysDir, nodeIds) {
+    // copy gossip keys to the staging
+    for (const nodeId of nodeIds) {
+      switch (keyFormat) {
+        case constants.KEY_FORMAT_PEM: {
+          const signingKeyFiles = this.prepareNodeKeyFilePaths(nodeId, keysDir, constants.SIGNING_KEY_PREFIX)
+          await this.copyNodeKeysToStaging(signingKeyFiles, stagingKeysDir)
+
+          // generate missing agreement keys
+          const agreementKeyFiles = this.prepareNodeKeyFilePaths(nodeId, keysDir, constants.AGREEMENT_KEY_PREFIX)
+          await this.copyNodeKeysToStaging(agreementKeyFiles, stagingKeysDir)
+          break
+        }
+
+        case constants.KEY_FORMAT_PFX: {
+          const privateKeyFile = Templates.renderGossipPfxPrivateKeyFile(nodeId)
+          fs.cpSync(path.join(keysDir, privateKeyFile), path.join(stagingKeysDir, privateKeyFile))
+          fs.cpSync(path.join(keysDir, constants.PUBLIC_PFX), path.join(stagingKeysDir, constants.PUBLIC_PFX))
+          break
+        }
+
+        default:
+          throw new FullstackTestingError(`Unsupported key-format ${keyFormat}`)
+      }
+    }
+  }
 }