fixed bugs

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

Author: jeromy-cannon

src/commands/node.mjs

@@ -108,7 +108,7 @@ export class NodeCommand extends BaseCommand {
         const output = await this.k8.execContainer(podName, constants.ROOT_CONTAINER, ['tail', '-10', logfilePath])
         if (output && output.indexOf('Terminating Netty') < 0 && // make sure we are not at the beginning of a restart
             (output.indexOf(`Now current platform status = ${status}`) > 0 ||
-            output.indexOf(`is ${status}`))) { // 'is ACTIVE' is for newer versions, first seen in v0.49.0
+            output.indexOf(`is ${status}`) > 0)) { // 'is ACTIVE' is for newer versions, first seen in v0.49.0
           this.logger.debug(`Node ${nodeId} is ${status} [ attempt: ${attempt}/${maxAttempt}]`)
           isActive = true
           break

test/e2e/commands/node.test.mjs

@@ -14,7 +14,13 @@
  * limitations under the License.
  *
  */
-import { AccountBalanceQuery, AccountCreateTransaction, Hbar, PrivateKey } from '@hashgraph/sdk'
+import {
+  AccountBalanceQuery,
+  AccountCreateTransaction,
+  Hbar,
+  HbarUnit,
+  PrivateKey
+} from '@hashgraph/sdk'
 import {
   afterAll,
   beforeAll,
@@ -35,8 +41,8 @@ import {
 import { sleep } from '../../../src/core/helpers.mjs'
 
 describe.each([
-  { releaseTag: 'v0.49.0-alpha.1', keyFormat: constants.KEY_FORMAT_PFX, testName: 'node-cmd-e2e-pfx' },
-  { releaseTag: 'v0.49.0-alpha.1', keyFormat: constants.KEY_FORMAT_PEM, testName: 'node-cmd-e2e-pem' }
+  { releaseTag: 'v0.49.0-alpha.1', keyFormat: constants.KEY_FORMAT_PFX, testName: 'node-cmd-e2e-pfx', mode: 'kill' },
+  { releaseTag: 'v0.49.0-alpha.1', keyFormat: constants.KEY_FORMAT_PEM, testName: 'node-cmd-e2e-pem', mode: 'stop' }
 ])('NodeCommand', (input) => {
   const testName = input.testName
   const namespace = testName
@@ -61,7 +67,7 @@ describe.each([
   describe(`Node should start successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
     balanceQueryShouldSucceed(accountManager, nodeCmd, namespace)
 
-    accountCreationShouldSucceed(accountManager, nodeCmd)
+    accountCreationShouldSucceed(accountManager, nodeCmd, namespace)
 
     it('Node Proxy should be UP', async () => {
       expect.assertions(1)
@@ -77,33 +83,20 @@ describe.each([
     }, 20000)
   })
 
-  describe(`Stopped node should refresh successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
-    const nodeId = 'node0'
-
-    beforeAll(async () => {
-      await nodeRefreshTestSetup(argv, testName, k8, nodeId)
-      await expect(nodeCmd.stop(argv)).resolves.toBeTruthy()
-    }, 120000)
-
-    nodeShouldBeRunning(nodeCmd, namespace, nodeId)
-
-    nodeShouldNotBeActive(nodeCmd, nodeId)
-
-    nodeRefreshShouldSucceed(nodeId, nodeCmd, argv)
-
-    balanceQueryShouldSucceed(accountManager, nodeCmd, namespace)
-
-    accountCreationShouldSucceed(accountManager, nodeCmd)
-  })
-
-  describe(`Killed node should refresh successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
+  describe(`Node should refresh successfully [mode ${input.mode}, release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
     const nodeId = 'node0'
 
     beforeAll(async () => {
       const podName = await nodeRefreshTestSetup(argv, testName, k8, nodeId)
-      const resp = await k8.kubeClient.deleteNamespacedPod(podName, namespace)
-      expect(resp.response.statusCode).toEqual(200)
-      await sleep(20000) // sleep to wait for pod to finish terminating
+      if (input.mode === 'kill') {
+        const resp = await k8.kubeClient.deleteNamespacedPod(podName, namespace)
+        expect(resp.response.statusCode).toEqual(200)
+        await sleep(20000) // sleep to wait for pod to finish terminating
+      } else if (input.mode === 'stop') {
+        await expect(nodeCmd.stop(argv)).resolves.toBeTruthy()
+      } else {
+        throw new Error(`invalid mode: ${input.mode}`)
+      }
     }, 120000)
 
     nodeShouldBeRunning(nodeCmd, namespace, nodeId)
@@ -114,29 +107,36 @@ describe.each([
 
     balanceQueryShouldSucceed(accountManager, nodeCmd, namespace)
 
-    accountCreationShouldSucceed(accountManager, nodeCmd)
+    accountCreationShouldSucceed(accountManager, nodeCmd, namespace)
   })
 })
 
-function accountCreationShouldSucceed (accountManager, nodeCmd) {
+function accountCreationShouldSucceed (accountManager, nodeCmd, namespace) {
   it('Account creation should succeed', async () => {
-    expect.assertions(2)
+    expect.assertions(3)
 
     try {
+      await accountManager.loadNodeClient(namespace)
       expect(accountManager._nodeClient).not.toBeNull()
-      const accountKey = PrivateKey.generate()
+      const privateKey = PrivateKey.generate()
+      const amount = 100
 
-      let transaction = await new AccountCreateTransaction()
-        .setNodeAccountIds([constants.HEDERA_NODE_ACCOUNT_ID_START])
-        .setInitialBalance(new Hbar(0))
-        .setKey(accountKey.publicKey)
-        .freezeWith(accountManager._nodeClient)
+      const newAccount = await new AccountCreateTransaction()
+        .setKey(privateKey)
+        .setInitialBalance(Hbar.from(amount, HbarUnit.Hbar))
+        .execute(accountManager._nodeClient)
 
-      transaction = await transaction.sign(accountKey)
-      const response = await transaction.execute(accountManager._nodeClient)
-      const receipt = await response.getReceipt(accountManager._nodeClient)
+      // Get the new account ID
+      const getReceipt = await newAccount.getReceipt(accountManager._nodeClient)
+      const accountInfo = {
+        accountId: getReceipt.accountId.toString(),
+        privateKey: privateKey.toString(),
+        publicKey: privateKey.publicKey.toString(),
+        balance: amount
+      }
 
-      expect(receipt.accountId).not.toBeNull()
+      expect(accountInfo.accountId).not.toBeNull()
+      expect(accountInfo.balance).toEqual(amount)
     } catch (e) {
       nodeCmd.logger.showUserError(e)
       expect(e).toBeNull()
@@ -179,7 +179,14 @@ function nodeShouldBeRunning (nodeCmd, namespace, nodeId) {
 
 function nodeRefreshShouldSucceed (nodeId, nodeCmd, argv) {
   it(`${nodeId} refresh should succeed`, async () => {
-    await expect(nodeCmd.refresh(argv)).resolves.toBeTruthy()
+    try {
+      await expect(nodeCmd.refresh(argv)).resolves.toBeTruthy()
+    } catch (e) {
+      nodeCmd.logger.showUserError(e)
+      expect(e).toBeNull()
+    } finally {
+      await nodeCmd.close()
+    }
   }, 1200000)
 }
 
@@ -203,7 +210,7 @@ async function nodeRefreshTestSetup (argv, testName, k8, nodeId) {
   configManager.update(argv, true)
 
   const podArray = await k8.getPodsByLabel(
-    ['app=network-node0', 'fullstack.hedera.com/type=network-node'])
+    [`app=network-${nodeId}`, 'fullstack.hedera.com/type=network-node'])
 
   if (podArray.length > 0) {
     const podName = podArray[0].metadata.name