fix test cases

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

Author: jeromy-cannon

src/commands/node.mjs

@@ -864,7 +864,7 @@ export class NodeCommand extends BaseCommand {
            */
 
           // create a config object for subsequent steps
-          const config = /** @type {NodeKeysConfigClass} **/ this.getConfig(NodeCommand.SETUP_CONFIGS_NAME, NodeCommand.SETUP_FLAGS_LIST,
+          const config = /** @type {NodeKeysConfigClass} **/ this.getConfig(NodeCommand.KEYS_CONFIGS_NAME, NodeCommand.KEYS_FLAGS_LIST,
             [
               'curDate',
               'keysDir',

test/e2e/core/platform_installer_e2e.test.mjs

@@ -42,6 +42,8 @@ describe('PackageInstallerE2E', () => {
   argv[flags.nodeIDs.name] = 'node0'
   argv[flags.clusterName.name] = TEST_CLUSTER
   argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
+  argv[flags.generateGossipKeys.name] = true
+  argv[flags.generateTlsKeys.name] = true
   // set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local FST charts
   argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
   const bootstrapResp = bootstrapNetwork(namespace, argv, undefined, undefined, undefined, undefined, undefined, undefined, false)
@@ -98,58 +100,4 @@ describe('PackageInstallerE2E', () => {
       testLogger.showUser(outputs)
     }, 60000)
   })
-
-  describe('copyGossipKeys', () => {
-    it('should succeed to copy legacy pfx gossip keys for node0', async () => {
-      const podName = 'network-node0-0'
-      const nodeId = 'node0'
-
-      // generate pfx keys
-      const pfxDir = 'test/data/pfx'
-      await k8.execContainer(podName, constants.ROOT_CONTAINER, ['bash', '-c', `rm -f ${constants.HEDERA_HAPI_PATH}/data/keys/*`])
-      const fileList = await installer.copyGossipKeys('node0', pfxDir, ['node0'], constants.KEY_FORMAT_PFX)
-
-      const destDir = `${constants.HEDERA_HAPI_PATH}/data/keys`
-      expect(fileList.length).toBe(2)
-      expect(fileList).toContain(`${destDir}/${Templates.renderGossipPfxPrivateKeyFile(nodeId)}`)
-      expect(fileList).toContain(`${destDir}/public.pfx`)
-    }, 60000)
-
-    it('should succeed to copy pem gossip keys for node0', async () => {
-      const podName = 'network-node0-0'
-
-      const pemDir = 'test/data/pem'
-      await k8.execContainer(podName, constants.ROOT_CONTAINER, ['bash', '-c', `rm -f ${constants.HEDERA_HAPI_PATH}/data/keys/*`])
-      const fileList = await installer.copyGossipKeys('node0', pemDir, ['node0'], constants.KEY_FORMAT_PEM)
-
-      const destDir = `${constants.HEDERA_HAPI_PATH}/data/keys`
-      expect(fileList.length).toBe(4)
-      expect(fileList).toContain(`${destDir}/${Templates.renderGossipPemPrivateKeyFile(constants.SIGNING_KEY_PREFIX, 'node0')}`)
-      expect(fileList).toContain(`${destDir}/${Templates.renderGossipPemPrivateKeyFile(constants.AGREEMENT_KEY_PREFIX, 'node0')}`)
-
-      // public keys
-      expect(fileList).toContain(`${destDir}/${Templates.renderGossipPemPublicKeyFile(constants.SIGNING_KEY_PREFIX, 'node0')}`)
-      expect(fileList).toContain(`${destDir}/${Templates.renderGossipPemPublicKeyFile(constants.AGREEMENT_KEY_PREFIX, 'node0')}`)
-    }, 60000)
-  })
-
-  describe('copyTLSKeys', () => {
-    it('should succeed to copy TLS keys for node0', async () => {
-      const nodeId = 'node0'
-      const podName = Templates.renderNetworkPodName(nodeId)
-      const tmpDir = getTmpDir()
-
-      // create mock files
-      const pemDir = 'test/data/pem'
-      await k8.execContainer(podName, constants.ROOT_CONTAINER, ['bash', '-c', `rm -f ${constants.HEDERA_HAPI_PATH}/hedera.*`])
-      const fileList = await installer.copyTLSKeys(podName, pemDir)
-
-      expect(fileList.length).toBe(2) // [data , hedera.crt, hedera.key]
-      expect(fileList.length).toBeGreaterThanOrEqual(2)
-      expect(fileList).toContain(`${constants.HEDERA_HAPI_PATH}/hedera.crt`)
-      expect(fileList).toContain(`${constants.HEDERA_HAPI_PATH}/hedera.key`)
-
-      fs.rmSync(tmpDir, { recursive: true })
-    }, defaultTimeout)
-  })
 })

test/test_util.js

@@ -220,6 +220,14 @@ export function bootstrapNetwork (testName, argv,
       }
     }, 120000)
 
+    it('generate key files', async () => {
+      await expect(nodeCmd.keys(argv)).resolves.toBeTruthy()
+      expect(nodeCmd.getUnusedConfigs(NodeCommand.KEYS_CONFIGS_NAME)).toEqual([
+        flags.cacheDir.constName,
+        flags.devMode.constName
+      ])
+    }, 120000)
+
     it('should succeed with network deploy', async () => {
       expect.assertions(1)
       await networkCmd.deploy(argv)