chore: move leasing packages into a subfolder

Signed-off-by: Nathan Klick <[email protected]>

Author: nathanklick

src/commands/account.ts

@@ -23,8 +23,8 @@ import * as prompts from './prompts.ts'
 import { constants, type AccountManager } from '../core/index.ts'
 import { type AccountId, AccountInfo, HbarUnit, PrivateKey } from '@hashgraph/sdk'
 import { FREEZE_ADMIN_ACCOUNT } from '../core/constants.ts'
-import { type Opts } from '../types/index.js'
-import { ListrLease } from '../core/listr_lease.js'
+import { type Opts } from '../types/index.ts'
+import { ListrLease } from '../core/lease/listr_lease.ts'
 
 export class AccountCommand extends BaseCommand {
   private readonly accountManager: AccountManager

src/commands/cluster.ts

@@ -23,7 +23,7 @@ import chalk from 'chalk'
 import { constants } from '../core/index.ts'
 import * as prompts from './prompts.ts'
 import path from 'path'
-import { ListrLease } from '../core/listr_lease.js'
+import { ListrLease } from '../core/lease/listr_lease.ts'
 
 /**
  * Define the core functionalities of 'cluster' command

src/commands/mirror_node.ts

@@ -24,7 +24,7 @@ import * as prompts from './prompts.ts'
 import { getFileContents, getEnvValue } from '../core/helpers.ts'
 import { type PodName } from '../types/aliases.ts'
 import { type Opts } from '../types/index.ts'
-import { ListrLease } from '../core/listr_lease.js'
+import { ListrLease } from '../core/lease/listr_lease.ts'
 
 export class MirrorNodeCommand extends BaseCommand {
   private readonly accountManager: AccountManager

src/commands/network.ts

@@ -29,7 +29,7 @@ import fs from 'fs'
 import type { CertificateManager, KeyManager, PlatformInstaller, ProfileManager } from '../core/index.ts'
 import type { NodeAlias, NodeAliases } from '../types/aliases.ts'
 import type { Opts } from '../types/index.ts'
-import { ListrLease } from '../core/listr_lease.js'
+import { ListrLease } from '../core/lease/listr_lease.ts'
 
 export interface NetworkDeployConfigClass {
   applicationEnv: string

src/commands/node/handlers.ts

@@ -34,7 +34,7 @@ import { IllegalArgumentError } from '../../core/errors.ts'
 import type { SoloLogger } from '../../core/logging.ts'
 import type { NodeCommand } from './index.ts'
 import type { NodeCommandTasks } from './tasks.ts'
-import { type Lease } from '../../core/lease.js'
+import { type Lease } from '../../core/lease/lease.ts'
 
 export class NodeCommandHandlers {
   private readonly accountManager: AccountManager

src/commands/node/tasks.ts

@@ -71,8 +71,8 @@ import * as x509 from '@peculiar/x509'
 import { type NodeCommand } from './index.ts'
 import type { NodeDeleteConfigClass, NodeRefreshConfigClass, NodeUpdateConfigClass } from './configs.ts'
 import type { NodeAddConfigClass } from './configs.ts'
-import { type Lease } from '../../core/lease.js'
-import { ListrLease } from '../../core/listr_lease.js'
+import { type Lease } from '../../core/lease/lease.ts'
+import { ListrLease } from '../../core/lease/listr_lease.ts'
 
 export class NodeCommandTasks {
   private readonly accountManager: AccountManager

src/commands/relay.ts

@@ -25,7 +25,7 @@ import * as prompts from './prompts.ts'
 import { getNodeAccountMap } from '../core/helpers.ts'
 import { type NodeAliases } from '../types/aliases.ts'
 import { type Opts } from '../types/index.ts'
-import { ListrLease } from '../core/listr_lease.js'
+import { ListrLease } from '../core/lease/listr_lease.ts'
 
 export class RelayCommand extends BaseCommand {
   private readonly profileManager: ProfileManager

src/core/helpers.ts

@@ -32,7 +32,7 @@ import { type CommandFlag } from '../types/index.ts'
 import { type V1Pod } from '@kubernetes/client-node'
 import { type SoloLogger } from './logging.ts'
 import { type NodeCommandHandlers } from '../commands/node/handlers.ts'
-import { type Lease } from './lease.js'
+import { type Lease } from './lease/lease.ts'
 
 export function sleep (ms: number) {
   return new Promise<void>((resolve) => {

src/core/index.ts

@@ -31,7 +31,7 @@ import { Task } from './task.ts'
 import * as helpers from './helpers.ts'
 import { DependencyManager } from './dependency_managers/index.ts'
 import { AccountManager } from './account_manager.ts'
-import { LeaseManager } from './lease_manager.ts'
+import { LeaseManager } from './lease/lease_manager.ts'
 import { CertificateManager } from './certificate_manager.ts'
 
 // Expose components from the core module

src/core/lease.ts renamed to src/core/lease/lease.ts

@@ -14,14 +14,14 @@
  * limitations under the License.
  *
  */
-import { MissingArgumentError, SoloError } from './errors.ts'
+import { MissingArgumentError, SoloError } from '../errors.ts'
 import { type V1Lease } from '@kubernetes/client-node'
-import { type K8 } from './k8.ts'
-import { SECONDS } from './constants.ts'
+import { type K8 } from '../k8.ts'
+import { SECONDS } from '../constants.ts'
 import { LeaseHolder } from './lease_holder.ts'
 import { LeaseAcquisitionError, LeaseRelinquishmentError } from './lease_errors.ts'
 import { type LeaseRenewalService } from './lease_renewal.ts'
-import { sleep } from './helpers.ts'
+import { sleep } from '../helpers.ts'
 
 export class Lease {
     /** The default duration in seconds for which the lease is to be held before being considered expired. */

src/core/lease_errors.ts renamed to src/core/lease/lease_errors.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-import { SoloError } from './errors.ts'
+import { SoloError } from '../errors.ts'
 
 export class LeaseAcquisitionError extends SoloError {
     /**

src/core/lease_holder.ts renamed to src/core/lease/lease_holder.ts

@@ -15,7 +15,7 @@
  *
  */
 
-import { MissingArgumentError } from './errors.ts'
+import { MissingArgumentError } from '../errors.ts'
 import os from 'node:os'
 import process from 'node:process'
 

src/core/lease_manager.ts renamed to src/core/lease/lease_manager.ts

@@ -14,11 +14,11 @@
  * limitations under the License.
  *
  */
-import { MissingArgumentError } from './errors.ts'
-import { flags } from '../commands/index.ts'
-import type { ConfigManager } from './config_manager.ts'
-import type { K8 } from './k8.ts'
-import type { SoloLogger } from './logging.ts'
+import { MissingArgumentError } from '../errors.ts'
+import { flags } from '../../commands/index.ts'
+import type { ConfigManager } from '../config_manager.ts'
+import type { K8 } from '../k8.ts'
+import type { SoloLogger } from '../logging.ts'
 import { type LeaseRenewalService } from './lease_renewal.ts'
 import { Lease } from './lease.ts'
 import { LeaseHolder } from './lease_holder.ts'

src/core/lease_renewal.ts renamed to src/core/lease/lease_renewal.ts

@@ -15,7 +15,7 @@
  *
  */
 import { type Lease } from './lease.ts'
-import { SECONDS } from './constants.ts'
+import { SECONDS } from '../constants.ts'
 
 export interface LeaseRenewalService {
     isScheduled (scheduleId: number): Promise<boolean>

src/core/listr_lease.ts renamed to src/core/lease/listr_lease.ts

@@ -29,7 +29,7 @@ import { K8 } from './core/k8.ts'
 import { ListrLogger } from 'listr2'
 import { CustomProcessOutput } from './core/process_output.ts'
 import { type Opts } from './types/index.ts'
-import { IntervalLeaseRenewalService, type LeaseRenewalService } from './core/lease_renewal.js'
+import { IntervalLeaseRenewalService, type LeaseRenewalService } from './core/lease/lease_renewal.ts'
 
 export function main (argv: any) {
   const logger = logging.NewLogger('debug')

src/index.ts

@@ -27,7 +27,7 @@ import {
 } from '../../../../src/core/index.ts'
 import { SECONDS } from '../../../../src/core/constants.ts'
 import sinon from 'sinon'
-import { IntervalLeaseRenewalService } from '../../../../src/core/lease_renewal.js'
+import { IntervalLeaseRenewalService } from '../../../../src/core/lease/lease_renewal.ts'
 
 const testLogger = logging.NewLogger('debug', true)
 describe('InitCommand', () => {

test/e2e/integration/commands/init.test.ts

@@ -19,10 +19,10 @@ import { ConfigManager, logging } from '../../../../src/core/index.ts'
 import { K8 } from '../../../../src/core/k8.ts'
 import { MINUTES, SECONDS } from '../../../../src/core/constants.ts'
 import { expect } from 'chai'
-import { Lease } from '../../../../src/core/lease.ts'
-import { LeaseHolder } from '../../../../src/core/lease_holder.ts'
+import { Lease } from '../../../../src/core/lease/lease.ts'
+import { LeaseHolder } from '../../../../src/core/lease/lease_holder.ts'
 import { sleep } from '../../../../src/core/helpers.ts'
-import { LeaseRelinquishmentError } from '../../../../src/core/lease_errors.ts'
+import { LeaseRelinquishmentError } from '../../../../src/core/lease/lease_errors.ts'
 import { NoopLeaseRenewalService } from './noop_lease_renewal_service.test.ts'
 
 

test/e2e/integration/core/lease.test.ts

@@ -19,10 +19,10 @@ import { ConfigManager, logging } from '../../../../src/core/index.ts'
 import { K8 } from '../../../../src/core/k8.ts'
 import { MINUTES, SECONDS } from '../../../../src/core/constants.ts'
 import { expect } from 'chai'
-import { Lease } from '../../../../src/core/lease.ts'
-import { LeaseHolder } from '../../../../src/core/lease_holder.ts'
+import { Lease } from '../../../../src/core/lease/lease.ts'
+import { LeaseHolder } from '../../../../src/core/lease/lease_holder.ts'
 import { sleep } from '../../../../src/core/helpers.ts'
-import { IntervalLeaseRenewalService } from '../../../../src/core/lease_renewal.ts'
+import { IntervalLeaseRenewalService } from '../../../../src/core/lease/lease_renewal.ts'
 import { type V1Lease } from '@kubernetes/client-node'
 
 

test/e2e/integration/core/lease_renewal.test.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-import type { Lease } from '../../../../src/core/lease.ts'
-import { type LeaseRenewalService } from '../../../../src/core/lease_renewal.ts'
+import type { Lease } from '../../../../src/core/lease/lease.ts'
+import { type LeaseRenewalService } from '../../../../src/core/lease/lease_renewal.ts'
 
 export class NoopLeaseRenewalService implements LeaseRenewalService {
     private readonly buffer: SharedArrayBuffer

test/e2e/integration/core/noop_lease_renewal_service.test.ts

@@ -64,7 +64,7 @@ import type { NodeAlias } from '../src/types/aliases.ts'
 import type { NetworkNodeServices } from '../src/core/network_node_services.ts'
 import sinon from 'sinon'
 import { HEDERA_PLATFORM_VERSION } from '../version.js'
-import { IntervalLeaseRenewalService } from '../src/core/lease_renewal.js'
+import { IntervalLeaseRenewalService } from '../src/core/lease/lease_renewal.ts'
 
 export const testLogger = logging.NewLogger('debug', true)
 export const TEST_CLUSTER = 'solo-e2e'