Skip to content

Commit

Permalink
chore(lint): manually fixed imports to be consisent (#1219)
Browse files Browse the repository at this point in the history
Signed-off-by: instamenta <[email protected]>
  • Loading branch information
instamenta authored Jan 28, 2025
1 parent d460985 commit 1c5212a
Show file tree
Hide file tree
Showing 40 changed files with 100 additions and 115 deletions.
6 changes: 3 additions & 3 deletions src/commands/account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import {SoloError, IllegalArgumentError} from '../core/errors.js';
import {Flags as flags} from './flags.js';
import {Listr} from 'listr2';
import * as constants from '../core/constants.js';
import {type AccountManager} from '../core/account_manager.js';
import type {AccountManager} from '../core/account_manager.js';
import {type AccountId, AccountInfo, HbarUnit, PrivateKey} from '@hashgraph/sdk';
import {FREEZE_ADMIN_ACCOUNT} from '../core/constants.js';
import {type Opts} from '../types/command_types.js';
import type {Opts} from '../types/command_types.js';
import {ListrLease} from '../core/lease/listr_lease.js';
import {type CommandBuilder} from '../types/aliases.js';
import type {CommandBuilder} from '../types/aliases.js';
import {sleep} from '../core/helpers.js';
import {Duration} from '../core/time/duration.js';

Expand Down
22 changes: 11 additions & 11 deletions src/commands/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
import paths from 'path';
import {MissingArgumentError, SoloError} from '../core/errors.js';
import {ShellRunner} from '../core/shell_runner.js';
import {type LeaseManager} from '../core/lease/lease_manager.js';
import {type LocalConfig} from '../core/config/local_config.js';
import {type RemoteConfigManager} from '../core/config/remote/remote_config_manager.js';
import {type Helm} from '../core/helm.js';
import {type K8} from '../core/k8.js';
import {type ChartManager} from '../core/chart_manager.js';
import {type ConfigManager} from '../core/config_manager.js';
import {type DependencyManager} from '../core/dependency_managers/index.js';
import {type Opts} from '../types/command_types.js';
import {type CommandFlag} from '../types/flag_types.js';
import {type Lease} from '../core/lease/lease.js';
import type {LeaseManager} from '../core/lease/lease_manager.js';
import type {LocalConfig} from '../core/config/local_config.js';
import type {RemoteConfigManager} from '../core/config/remote/remote_config_manager.js';
import type {Helm} from '../core/helm.js';
import type {K8} from '../core/k8.js';
import type {ChartManager} from '../core/chart_manager.js';
import type {ConfigManager} from '../core/config_manager.js';
import type {DependencyManager} from '../core/dependency_managers/index.js';
import type {Opts} from '../types/command_types.js';
import type {CommandFlag} from '../types/flag_types.js';
import type {Lease} from '../core/lease/lease.js';
import {Listr} from 'listr2';
import path from 'path';
import * as constants from '../core/constants.js';
Expand Down
4 changes: 2 additions & 2 deletions src/commands/cluster/configs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

import {type NodeAlias} from '../../types/aliases.js';
import type {NodeAlias} from '../../types/aliases.js';
import {Flags as flags} from '../flags.js';
import * as constants from '../../core/constants.js';
import {ListrEnquirerPromptAdapter} from '@listr2/prompt-adapter-enquirer';
import {SoloError} from '../../core/errors.js';
import {type Namespace} from '../../core/config/remote/types.js';
import type {Namespace} from '../../core/config/remote/types.js';

export const CONNECT_CONFIGS_NAME = 'connectConfig';

Expand Down
4 changes: 2 additions & 2 deletions src/commands/cluster/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*
*/
import {type BaseCommand, type CommandHandlers} from '../base.js';
import {type ClusterCommandTasks} from './tasks.js';
import type {BaseCommand, CommandHandlers} from '../base.js';
import type {ClusterCommandTasks} from './tasks.js';
import * as helpers from '../../core/helpers.js';
import * as constants from '../../core/constants.js';
import * as ContextFlags from './flags.js';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/cluster/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import * as ContextFlags from './flags.js';
import {YargsCommand} from '../../core/yargs_command.js';
import {BaseCommand} from './../base.js';
import {type Opts} from '../../types/command_types.js';
import type {Opts} from '../../types/command_types.js';
import {ClusterCommandTasks} from './tasks.js';
import {ClusterCommandHandlers} from './handlers.js';
import {DEFAULT_FLAGS, RESET_FLAGS, SETUP_FLAGS} from './flags.js';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/cluster/tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {Task} from '../../core/task.js';
import {Flags as flags} from '../flags.js';
import type {ListrTaskWrapper} from 'listr2';
import type {ConfigBuilder} from '../../types/aliases.js';
import {type BaseCommand} from '../base.js';
import type {BaseCommand} from '../base.js';
import {splitFlagInput} from '../../core/helpers.js';
import * as constants from '../../core/constants.js';
import path from 'path';
Expand Down
8 changes: 4 additions & 4 deletions src/commands/explorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ import {ListrEnquirerPromptAdapter} from '@listr2/prompt-adapter-enquirer';
import {Listr} from 'listr2';
import {SoloError, MissingArgumentError} from '../core/errors.js';
import * as constants from '../core/constants.js';
import {type ProfileManager} from '../core/profile_manager.js';
import type {ProfileManager} from '../core/profile_manager.js';
import {BaseCommand} from './base.js';
import {Flags as flags} from './flags.js';
import {ListrRemoteConfig} from '../core/config/remote/listr_config_tasks.js';
import {type CommandBuilder} from '../types/aliases.js';
import {type Opts} from '../types/command_types.js';
import type {CommandBuilder} from '../types/aliases.js';
import type {Opts} from '../types/command_types.js';
import {ListrLease} from '../core/lease/listr_lease.js';
import {ComponentType} from '../core/config/remote/enumerations.js';
import type {Namespace} from '../core/config/remote/types.js';
import {MirrorNodeExplorerComponent} from '../core/config/remote/components/mirror_node_explorer_component.js';
import {type SoloListrTask} from '../types/index.js';
import type {SoloListrTask} from '../types/index.js';

interface ExplorerDeployConfigClass {
chartDirectory: string;
Expand Down
4 changes: 2 additions & 2 deletions src/commands/flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import * as constants from '../core/constants.js';
import * as version from '../../version.js';
import path from 'path';
import {type CommandFlag} from '../types/flag_types.js';
import {type ListrTaskWrapper} from 'listr2';
import type {CommandFlag} from '../types/flag_types.js';
import type {ListrTaskWrapper} from 'listr2';
import fs from 'fs';
import {IllegalArgumentError, SoloError} from '../core/errors.js';
import {ListrEnquirerPromptAdapter} from '@listr2/prompt-adapter-enquirer';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {NodeCommand} from './node/index.js';
import {RelayCommand} from './relay.js';
import {AccountCommand} from './account.js';
import {DeploymentCommand} from './deployment.js';
import {type Opts} from '../types/command_types.js';
import type {Opts} from '../types/command_types.js';
import {ExplorerCommand} from './explorer.js';

/**
Expand Down
9 changes: 4 additions & 5 deletions src/commands/mirror_node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,19 @@ import {ListrEnquirerPromptAdapter} from '@listr2/prompt-adapter-enquirer';
import {Listr} from 'listr2';
import {SoloError, IllegalArgumentError, MissingArgumentError} from '../core/errors.js';
import * as constants from '../core/constants.js';
import {type AccountManager} from '../core/account_manager.js';
import {type ProfileManager} from '../core/profile_manager.js';
import type {AccountManager} from '../core/account_manager.js';
import type {ProfileManager} from '../core/profile_manager.js';
import {BaseCommand} from './base.js';
import {Flags as flags} from './flags.js';
import {getEnvValue} from '../core/helpers.js';
import {type CommandBuilder, type PodName} from '../types/aliases.js';
import {type Opts} from '../types/command_types.js';
import type {CommandBuilder, PodName} from '../types/aliases.js';
import type {Opts} from '../types/command_types.js';
import {ListrLease} from '../core/lease/listr_lease.js';
import {ComponentType} from '../core/config/remote/enumerations.js';
import {MirrorNodeComponent} from '../core/config/remote/components/mirror_node_component.js';
import * as fs from 'node:fs';
import * as path from 'node:path';
import type {Optional, SoloListrTask} from '../types/index.js';
import type {Namespace} from '../core/config/remote/types.js';
import * as Base64 from 'js-base64';

interface MirrorNodeDeployConfigClass {
Expand Down
12 changes: 6 additions & 6 deletions src/commands/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import * as helpers from '../core/helpers.js';
import {addDebugOptions, resolveValidJsonFilePath, validatePath} from '../core/helpers.js';
import path from 'path';
import fs from 'fs';
import {type KeyManager} from '../core/key_manager.js';
import {type PlatformInstaller} from '../core/platform_installer.js';
import {type ProfileManager} from '../core/profile_manager.js';
import {type CertificateManager} from '../core/certificate_manager.js';
import {type CommandBuilder, type IP, type NodeAlias, type NodeAliases} from '../types/aliases.js';
import {type Opts} from '../types/command_types.js';
import type {KeyManager} from '../core/key_manager.js';
import type {PlatformInstaller} from '../core/platform_installer.js';
import type {ProfileManager} from '../core/profile_manager.js';
import type {CertificateManager} from '../core/certificate_manager.js';
import type {CommandBuilder, IP, NodeAlias, NodeAliases} from '../types/aliases.js';
import type {Opts} from '../types/command_types.js';
import {ListrLease} from '../core/lease/listr_lease.js';
import {ConsensusNodeComponent} from '../core/config/remote/components/consensus_node_component.js';
import {ConsensusNodeStates} from '../core/config/remote/enumerations.js';
Expand Down
2 changes: 1 addition & 1 deletion src/commands/node/configs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {validatePath} from '../../core/helpers.js';
import {Flags as flags} from '../flags.js';
import type {NodeAlias, NodeAliases, PodName} from '../../types/aliases.js';
import type {NetworkNodeServices} from '../../core/network_node_services.js';
import {type NodeAddConfigClass} from './node_add_config.js';
import type {NodeAddConfigClass} from './node_add_config.js';

export const PREPARE_UPGRADE_CONFIGS_NAME = 'prepareUpgradeConfig';
export const DOWNLOAD_GENERATED_FILES_CONFIGS_NAME = 'downloadGeneratedFilesConfig';
Expand Down
18 changes: 9 additions & 9 deletions src/commands/node/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ import {
upgradeConfigBuilder,
} from './configs.js';
import * as constants from '../../core/constants.js';
import {type AccountManager} from '../../core/account_manager.js';
import {type ConfigManager} from '../../core/config_manager.js';
import {type PlatformInstaller} from '../../core/platform_installer.js';
import {type K8} from '../../core/k8.js';
import {type LeaseManager} from '../../core/lease/lease_manager.js';
import {type RemoteConfigManager} from '../../core/config/remote/remote_config_manager.js';
import type {AccountManager} from '../../core/account_manager.js';
import type {ConfigManager} from '../../core/config_manager.js';
import type {PlatformInstaller} from '../../core/platform_installer.js';
import type {K8} from '../../core/k8.js';
import type {LeaseManager} from '../../core/lease/lease_manager.js';
import type {RemoteConfigManager} from '../../core/config/remote/remote_config_manager.js';
import {IllegalArgumentError, SoloError} from '../../core/errors.js';
import {ComponentType, ConsensusNodeStates} from '../../core/config/remote/enumerations.js';
import type {SoloLogger} from '../../core/logging.js';
import type {NodeCommandTasks} from './tasks.js';
import {type Lease} from '../../core/lease/lease.js';
import type {Lease} from '../../core/lease/lease.js';
import {NodeSubcommandType} from '../../core/enumerations.js';
import {type BaseCommand, type CommandHandlers} from '../base.js';
import type {BaseCommand, CommandHandlers} from '../base.js';
import {NodeHelper} from './helper.js';
import type {NodeAlias, NodeAliases} from '../../types/aliases.js';
import {ConsensusNodeComponent} from '../../core/config/remote/components/consensus_node_component.js';
import {type Listr, type ListrTask} from 'listr2';
import type {Listr, ListrTask} from 'listr2';
import chalk from 'chalk';
import type {ComponentsDataWrapper} from '../../core/config/remote/components_data_wrapper.js';
import type {Optional} from '../../types/index.js';
Expand Down
4 changes: 2 additions & 2 deletions src/commands/node/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*
*/

import {type NodeDeleteConfigClass, type NodeUpdateConfigClass, type NodeUpgradeConfigClass} from './configs.js';
import {type NodeAlias, type NodeAliases} from '../../types/aliases.js';
import type {NodeDeleteConfigClass, NodeUpdateConfigClass, NodeUpgradeConfigClass} from './configs.js';
import type {NodeAlias, NodeAliases} from '../../types/aliases.js';
import {PrivateKey} from '@hashgraph/sdk';

export class NodeHelper {
Expand Down
4 changes: 2 additions & 2 deletions src/commands/node/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
*/

import {IllegalArgumentError} from '../../core/errors.js';
import {type AccountManager} from '../../core/account_manager.js';
import type {AccountManager} from '../../core/account_manager.js';
import {YargsCommand} from '../../core/yargs_command.js';
import {BaseCommand} from './../base.js';
import {NodeCommandTasks} from './tasks.js';
import * as NodeFlags from './flags.js';
import {NodeCommandHandlers} from './handlers.js';
import {type Opts} from '../../types/command_types.js';
import type {Opts} from '../../types/command_types.js';

/**
* Defines the core functionalities of 'node' command
Expand Down
2 changes: 1 addition & 1 deletion src/commands/node/node_add_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
import type {NodeAlias, NodeAliases, PodName} from '../../types/aliases.js';
import type {NetworkNodeServices} from '../../core/network_node_services.js';
import {type PrivateKey} from '@hashgraph/sdk';
import type {PrivateKey} from '@hashgraph/sdk';

export interface NodeAddConfigClass {
app: string;
Expand Down
32 changes: 13 additions & 19 deletions src/commands/node/tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* limitations under the License.
*
*/
import {type AccountManager} from '../../core/account_manager.js';
import {type ConfigManager} from '../../core/config_manager.js';
import {type KeyManager} from '../../core/key_manager.js';
import {type ProfileManager} from '../../core/profile_manager.js';
import {type PlatformInstaller} from '../../core/platform_installer.js';
import {type K8} from '../../core/k8.js';
import {type ChartManager} from '../../core/chart_manager.js';
import {type CertificateManager} from '../../core/certificate_manager.js';
import type {AccountManager} from '../../core/account_manager.js';
import type {ConfigManager} from '../../core/config_manager.js';
import type {KeyManager} from '../../core/key_manager.js';
import type {ProfileManager} from '../../core/profile_manager.js';
import type {PlatformInstaller} from '../../core/platform_installer.js';
import type {K8} from '../../core/k8.js';
import type {ChartManager} from '../../core/chart_manager.js';
import type {CertificateManager} from '../../core/certificate_manager.js';
import {Zippy} from '../../core/zippy.js';
import * as constants from '../../core/constants.js';
import {
Expand Down Expand Up @@ -62,22 +62,16 @@ import {
} from '../../core/helpers.js';
import chalk from 'chalk';
import {Flags as flags} from '../flags.js';
import {type SoloLogger} from '../../core/logging.js';
import type {SoloLogger} from '../../core/logging.js';
import type {Listr, ListrTaskWrapper} from 'listr2';
import {
type ConfigBuilder,
type NodeAlias,
type NodeAliases,
type PodName,
type SkipCheck,
} from '../../types/aliases.js';
import type {ConfigBuilder, NodeAlias, NodeAliases, PodName, SkipCheck} from '../../types/aliases.js';
import {NodeStatusCodes, NodeStatusEnums, NodeSubcommandType} from '../../core/enumerations.js';
import type {NodeDeleteConfigClass, NodeRefreshConfigClass, NodeUpdateConfigClass} from './configs.js';
import {type Lease} from '../../core/lease/lease.js';
import type {Lease} from '../../core/lease/lease.js';
import {ListrLease} from '../../core/lease/listr_lease.js';
import {Duration} from '../../core/time/duration.js';
import {type BaseCommand} from '../base.js';
import {type NodeAddConfigClass} from './node_add_config.js';
import type {BaseCommand} from '../base.js';
import type {NodeAddConfigClass} from './node_add_config.js';
import {GenesisNetworkDataConstructor} from '../../core/genesis_network_models/genesis_network_data_constructor.js';

export class NodeCommandTasks {
Expand Down
8 changes: 4 additions & 4 deletions src/commands/relay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import {Listr, type ListrTask} from 'listr2';
import {SoloError, MissingArgumentError} from '../core/errors.js';
import * as helpers from '../core/helpers.js';
import * as constants from '../core/constants.js';
import {type ProfileManager} from '../core/profile_manager.js';
import {type AccountManager} from '../core/account_manager.js';
import type {ProfileManager} from '../core/profile_manager.js';
import type {AccountManager} from '../core/account_manager.js';
import {BaseCommand} from './base.js';
import {Flags as flags} from './flags.js';
import {getNodeAccountMap} from '../core/helpers.js';
import {type CommandBuilder, type NodeAliases} from '../types/aliases.js';
import {type Opts} from '../types/command_types.js';
import type {CommandBuilder, NodeAliases} from '../types/aliases.js';
import type {Opts} from '../types/command_types.js';
import {ListrLease} from '../core/lease/listr_lease.js';
import {RelayComponent} from '../core/config/remote/components/relay_component.js';
import {ComponentType} from '../core/config/remote/enumerations.js';
Expand Down
4 changes: 2 additions & 2 deletions src/core/account_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ import path from 'path';

import {SoloLogger} from './logging.js';
import {K8} from './k8.js';
import {type AccountIdWithKeyPairObject, type ExtendedNetServer} from '../types/index.js';
import {type NodeAlias, type PodName, type SdkNetworkEndpoint} from '../types/aliases.js';
import type {AccountIdWithKeyPairObject, ExtendedNetServer} from '../types/index.js';
import type {NodeAlias, PodName, SdkNetworkEndpoint} from '../types/aliases.js';
import {IGNORED_NODE_ACCOUNT_ID} from './constants.js';
import {isNumeric, sleep} from './helpers.js';
import {Duration} from './time/duration.js';
Expand Down
10 changes: 2 additions & 8 deletions src/core/config/local_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,18 @@ import {IsEmail, IsNotEmpty, IsObject, IsString, validateSync} from 'class-valid
import fs from 'fs';
import * as yaml from 'yaml';
import {Flags as flags} from '../../commands/flags.js';
import {
type ClusterContextMapping,
type Deployments,
type DeploymentStructure,
type LocalConfigData,
} from './local_config_data.js';
import type {ClusterContextMapping, Deployments, DeploymentStructure, LocalConfigData} from './local_config_data.js';
import {MissingArgumentError, SoloError} from '../errors.js';
import {SoloLogger} from '../logging.js';
import {IsClusterContextMapping, IsDeployments} from '../validator_decorators.js';
import {ConfigManager} from '../config_manager.js';
import type {EmailAddress, Namespace} from './remote/types.js';
import {ErrorMessages} from '../error_messages.js';
import {type K8} from '../k8.js';
import type {K8} from '../k8.js';
import {splitFlagInput} from '../helpers.js';
import {inject, injectable} from 'tsyringe-neo';
import {patchInject} from '../container_helper.js';
import type {SoloListrTask} from '../../types/index.js';
import type {AnyObject} from '../../types/aliases.js';

@injectable()
export class LocalConfig implements LocalConfigData {
Expand Down
2 changes: 1 addition & 1 deletion src/core/config/remote/remote_config_data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import type {RemoteConfigMetadata} from './metadata.js';
import type {ComponentsDataWrapper} from './components_data_wrapper.js';
import type {CommonFlagsDataWrapper} from './common_flags_data_wrapper.js';
import {type Cluster, type Namespace} from './types.js';
import type {Cluster, Namespace} from './types.js';

export interface RemoteConfigData {
metadata: RemoteConfigMetadata;
Expand Down
2 changes: 1 addition & 1 deletion src/core/config/remote/remote_config_data_wrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import type {Cluster, Version, Namespace, RemoteConfigDataStructure} from './typ
import type * as k8s from '@kubernetes/client-node';
import type {ToObject, Validate} from '../../../types/index.js';
import type {ConfigManager} from '../../config_manager.js';
import {type RemoteConfigData} from './remote_config_data.js';
import type {RemoteConfigData} from './remote_config_data.js';

export class RemoteConfigDataWrapper implements Validate, ToObject<RemoteConfigDataStructure> {
private readonly _version: Version = '1.0.0';
Expand Down
4 changes: 2 additions & 2 deletions src/core/config_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import {Flags, Flags as flags} from '../commands/flags.js';
import * as paths from 'path';
import * as helpers from './helpers.js';
import type * as yargs from 'yargs';
import {type CommandFlag} from '../types/flag_types.js';
import {type ListrTaskWrapper} from 'listr2';
import type {CommandFlag} from '../types/flag_types.js';
import type {ListrTaskWrapper} from 'listr2';
import {patchInject} from './container_helper.js';
import * as constants from '../core/constants.js';

Expand Down
Loading

0 comments on commit 1c5212a

Please sign in to comment.