refactor: address comments

Author: cctdaniel

governance/xc_admin/packages/xc_admin_common/src/programs/program_registry.ts

@@ -8,11 +8,7 @@ import {
   ProgramConfig,
   GetConfigParams,
   LazerConfigParams,
-} from "./types";
-import {
-  ProgramFunctions,
   ValidationResult,
-  GenerateInstructionsFn,
 } from "./types";
 
 // Import functions from each program implementation
@@ -92,29 +88,6 @@ export const validateUploadedConfig: Record<
  * Function to generate the necessary instructions to apply configuration changes
  */
 export const generateInstructions = {
-  [ProgramType.PYTH_CORE]:
-    pythCore.generateInstructions as GenerateInstructionsFn<ProgramType.PYTH_CORE>,
-  [ProgramType.PYTH_LAZER]:
-    pythLazer.generateInstructions as GenerateInstructionsFn<ProgramType.PYTH_LAZER>,
+  [ProgramType.PYTH_CORE]: pythCore.generateInstructions,
+  [ProgramType.PYTH_LAZER]: pythLazer.generateInstructions,
 };
-
-/**
- * Get the complete set of functions for a specific program type
- *
- * @param type The program type to get functions for
- * @returns All functions for the specified program type
- */
-export function getProgramFunctions<T extends ProgramType>(
-  type: T,
-): ProgramFunctions<T> {
-  return {
-    getProgramAddress: getProgramAddress[type],
-    isAvailableOnCluster: isAvailableOnCluster[type],
-    getConfig: getConfig[type],
-    getDownloadableConfig: getDownloadableConfig[type],
-    validateUploadedConfig: validateUploadedConfig[type],
-    generateInstructions: generateInstructions[
-      type
-    ] as GenerateInstructionsFn<T>,
-  };
-}

governance/xc_admin/packages/xc_admin_common/src/programs/types.ts

@@ -107,11 +107,6 @@ export type GetConfigParams =
     } & CoreConfigParams)
   | ({ programType: ProgramType.PYTH_LAZER } & LazerConfigParams);
 
-/**
- * Function to get configuration data
- */
-export type GetConfigFn = (params: GetConfigParams) => ProgramConfig;
-
 /**
  * Lazer feed configuration
  * TODO: Change to actual Lazer feed type
@@ -145,9 +140,7 @@ export type DownloadableProduct = {
 /**
  * Type for downloadable configuration
  */
-export type DownloadableConfig = {
-  [symbol: string]: DownloadableProduct;
-};
+export type DownloadableConfig = Record<string, DownloadableProduct>;
 
 /**
  * Type for configuration that can be either RawConfig for Pyth Core or LazerConfig for Lazer
@@ -191,23 +184,6 @@ export type InstructionAccountsTypeMap = {
   [ProgramType.PYTH_LAZER]: LazerInstructionAccounts;
 };
 
-/**
- * Function to get the program address for the given cluster and program type
- */
-export type GetProgramAddressFn = (cluster: PythCluster) => PublicKey;
-
-/**
- * Function to check if a program is available on a specific cluster
- */
-export type IsAvailableOnClusterFn = (cluster: PythCluster) => boolean;
-
-/**
- * Function to format the configuration for downloading as a JSON file
- */
-export type GetDownloadableConfigFn = (
-  config: ProgramConfig,
-) => DownloadableConfig;
-
 /**
  * Result of validating an uploaded configuration
  */
@@ -216,39 +192,3 @@ export interface ValidationResult {
   error?: string;
   changes?: any;
 }
-
-/**
- * Function to validate an uploaded configuration against the current configuration
- */
-export type ValidateUploadedConfigFn = (
-  existingConfig: DownloadableConfig,
-  uploadedConfig: unknown,
-  cluster: PythCluster,
-) => ValidationResult;
-
-/**
- * Generic type for generate instructions functions for a specific program type
- */
-export type GenerateInstructionsFn<T extends ProgramType = ProgramType> = (
-  changes: Record<
-    string,
-    {
-      prev?: Partial<DownloadableProduct>;
-      new?: Partial<DownloadableProduct>;
-    }
-  >,
-  cluster: PythCluster,
-  accounts: InstructionAccountsTypeMap[T],
-) => Promise<TransactionInstruction[]>;
-
-/**
- * Collection of functions for each program type
- */
-export interface ProgramFunctions<T extends ProgramType = ProgramType> {
-  getProgramAddress: GetProgramAddressFn;
-  isAvailableOnCluster: IsAvailableOnClusterFn;
-  getConfig: GetConfigFn;
-  getDownloadableConfig: GetDownloadableConfigFn;
-  validateUploadedConfig: ValidateUploadedConfigFn;
-  generateInstructions: GenerateInstructionsFn<T>;
-}

governance/xc_admin/packages/xc_admin_frontend/components/ProgramSwitch.tsx

@@ -30,12 +30,12 @@ const ProgramSwitch = ({ light = false }: { light?: boolean }) => {
   const { programType, setProgramType } = useProgramContext()
 
   // Convert enum to array of options
-  const programOptions = Object.values(ProgramType)
-    .filter((value): value is ProgramType => typeof value === 'number') // Filter out reverse mappings
-    .map((value) => ({
-      value,
-      label: PROGRAM_TYPE_NAMES[value],
-    }))
+  const programOptions = Object.entries(PROGRAM_TYPE_NAMES).map(
+    ([value, label]) => ({
+      value: Number(value) as ProgramType,
+      label,
+    })
+  )
 
   return (
     <Menu as="div" className="relative z-[5] block w-[180px] text-left">