Skip to content

Commit

Permalink
fix: formatting
Browse files Browse the repository at this point in the history 
Signed-off-by: Ivo Yankov <[email protected]>
  • Loading branch information
@Ivo-Yankov
Ivo-Yankov committed Sep 20, 2024
1 parent 29d4afc commit 325b34d
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 71 deletions.
134 changes: 65 additions & 69 deletions src/commands/node.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export class NodeCommand extends BaseCommand {

static get DELETE_FLAGS_LIST () {
return [
...NodeCommand.COMMON_DELETE_FLAGS_LIST
...NodeCommand.COMMON_DELETE_FLAGS_LIST
]
}

Expand Down Expand Up @@ -2640,7 +2640,6 @@ export class NodeCommand extends BaseCommand {
}
})
.demandCommand(1, 'Select a node command')

}
}
}
Expand Down Expand Up @@ -3056,25 +3055,25 @@ export class NodeCommand extends BaseCommand {

return {
title: 'Initialize',
task: async (ctx, task) => {
self.configManager.update(argv)

// disable the prompts that we don't want to prompt the user for
prompts.disablePrompts([
flags.app,
flags.chainId,
flags.chartDirectory,
flags.devMode,
flags.debugNodeId,
flags.endpointType,
flags.force,
flags.fstChartVersion,
flags.localBuildPath
])

await prompts.execute(task, self.configManager, NodeCommand.DELETE_FLAGS_LIST)

/**
task: async (ctx, task) => {
self.configManager.update(argv)

// disable the prompts that we don't want to prompt the user for
prompts.disablePrompts([
flags.app,
flags.chainId,
flags.chartDirectory,
flags.devMode,
flags.debugNodeId,
flags.endpointType,
flags.force,
flags.fstChartVersion,
flags.localBuildPath
])

await prompts.execute(task, self.configManager, NodeCommand.DELETE_FLAGS_LIST)

/**
* @typedef {Object} NodeDeleteConfigClass
* -- flags --
* @property {string} app
Expand Down Expand Up @@ -3104,56 +3103,55 @@ export class NodeCommand extends BaseCommand {
* -- methods --
* @property {getUnusedConfigs} getUnusedConfigs
*/
/**
/**
* @callback getUnusedConfigs
* @returns {string[]}
*/

// create a config object for subsequent steps
const config = /** @type {NodeDeleteConfigClass} **/ this.getConfig(NodeCommand.DELETE_CONFIGS_NAME, NodeCommand.DELETE_FLAGS_LIST,
[
'adminKey',
'allNodeIds',
'existingNodeIds',
'freezeAdminPrivateKey',
'keysDir',
'nodeClient',
'nodeId',
'podNames',
'serviceMap',
'stagingDir',
'stagingKeysDir',
'treasuryKey'
])

config.nodeId = argv.nodeId
config.curDate = new Date()
config.existingNodeIds = []

await self.initializeSetup(config, self.k8)

// set config in the context for later tasks to use
ctx.config = config

ctx.config.chartPath = await self.prepareChartPath(ctx.config.chartDirectory,
// create a config object for subsequent steps
const config = /** @type {NodeDeleteConfigClass} **/ this.getConfig(NodeCommand.DELETE_CONFIGS_NAME, NodeCommand.DELETE_FLAGS_LIST,
[
'adminKey',
'allNodeIds',
'existingNodeIds',
'freezeAdminPrivateKey',
'keysDir',
'nodeClient',
'nodeId',
'podNames',
'serviceMap',
'stagingDir',
'stagingKeysDir',
'treasuryKey'
])

config.nodeId = argv.nodeId
config.curDate = new Date()
config.existingNodeIds = []

await self.initializeSetup(config, self.k8)

// set config in the context for later tasks to use
ctx.config = config

ctx.config.chartPath = await self.prepareChartPath(ctx.config.chartDirectory,
constants.FULLSTACK_TESTING_CHART, constants.FULLSTACK_DEPLOYMENT_CHART)

// initialize Node Client with existing network nodes prior to adding the new node which isn't functioning, yet
ctx.config.nodeClient = await this.accountManager.loadNodeClient(ctx.config.namespace)
// initialize Node Client with existing network nodes prior to adding the new node which isn't functioning, yet
ctx.config.nodeClient = await this.accountManager.loadNodeClient(ctx.config.namespace)

const accountKeys = await this.accountManager.getAccountKeysFromSecret(FREEZE_ADMIN_ACCOUNT, config.namespace)
config.freezeAdminPrivateKey = accountKeys.privateKey
const accountKeys = await this.accountManager.getAccountKeysFromSecret(FREEZE_ADMIN_ACCOUNT, config.namespace)
config.freezeAdminPrivateKey = accountKeys.privateKey

const treasuryAccount = await this.accountManager.getTreasuryAccountKeys(config.namespace)
const treasuryAccountPrivateKey = treasuryAccount.privateKey
config.treasuryKey = PrivateKey.fromStringED25519(treasuryAccountPrivateKey)
const treasuryAccount = await this.accountManager.getTreasuryAccountKeys(config.namespace)
const treasuryAccountPrivateKey = treasuryAccount.privateKey
config.treasuryKey = PrivateKey.fromStringED25519(treasuryAccountPrivateKey)

self.logger.debug('Initialized config', { config })
}
self.logger.debug('Initialized config', { config })
}
}
}


deletePrepareTasks (argv) {
return [
this.deleteInitializeTask(argv),
Expand Down Expand Up @@ -3187,7 +3185,6 @@ export class NodeCommand extends BaseCommand {
}
}
]

}

deleteExecuteTasks (argv) {
Expand Down Expand Up @@ -3260,9 +3257,9 @@ export class NodeCommand extends BaseCommand {
async (ctx, task) => {
const config = /** @type {NodeDeleteConfigClass} **/ ctx.config
config.serviceMap = await self.accountManager.getNodeServiceMap(
config.namespace)
config.namespace)
config.podNames[config.nodeId] = config.serviceMap.get(
config.nodeId).nodePodName
config.nodeId).nodePodName
return self.fetchLocalOrReleasedPlatformSoftware(config.allNodeIds, config.podNames, config.releaseTag, task, config.localBuildPath)
}
},
Expand Down Expand Up @@ -3332,8 +3329,8 @@ export class NodeCommand extends BaseCommand {
this.logger.debug(`Deleting node: ${config.nodeId} with account: ${deleteAccountId}`)
const nodeId = Templates.nodeNumberFromNodeId(config.nodeId) - 1
const nodeDeleteTx = await new NodeDeleteTransaction()
.setNodeId(nodeId)
.freezeWith(config.nodeClient)
.setNodeId(nodeId)
.freezeWith(config.nodeClient)

const signedTx = await nodeDeleteTx.sign(config.adminKey)
const txResp = await signedTx.execute(config.nodeClient)
Expand All @@ -3358,7 +3355,7 @@ export class NodeCommand extends BaseCommand {
const config = /** @type {NodeDeleteConfigClass} **/ ctx.config
await this.freezeUpgradeNetworkNodes(config.freezeAdminPrivateKey, ctx.upgradeZipHash, config.nodeClient)
}
},
}
]
}

Expand Down Expand Up @@ -3433,14 +3430,13 @@ export class NodeCommand extends BaseCommand {
return true
}


async delete (argv) {
const self = this

const tasks = new Listr([
...self.deletePrepareTasks(argv),
...self.deleteSubmitTransactionsTasks(argv),
...self.deleteExecuteTasks(argv)
...self.deletePrepareTasks(argv),
...self.deleteSubmitTransactionsTasks(argv),
...self.deleteExecuteTasks(argv)
], {
concurrent: false,
rendererOptions: constants.LISTR_DEFAULT_RENDERER_OPTION
Expand Down
3 changes: 1 addition & 2 deletions src/core/helpers.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import * as semver from 'semver'
import { Templates } from './templates.mjs'
import { HEDERA_HAPI_PATH, ROOT_CONTAINER, SOLO_LOGS_DIR } from './constants.mjs'
import { constants } from './index.mjs'
import {FileContentsQuery, FileId, PrivateKey} from '@hashgraph/sdk'
import { FileContentsQuery, FileId, PrivateKey } from '@hashgraph/sdk'

// cache current directory
const CUR_FILE_DIR = paths.dirname(fileURLToPath(import.meta.url))
Expand Down Expand Up @@ -443,4 +443,3 @@ export function deleteLoadContextParser (ctx, ctxData) {
ctx.upgradeZipHash = ctxData.upgradeZipHash
config.podNames = {}
}

0 comments on commit 325b34d

Please sign in to comment.