Rename types

Author: sean-kuzco

sdk/src/sdk.ts

@@ -28,9 +28,9 @@ import type {
 import type { InferenceStaking } from "./idl";
 import { getIdlWithProgramId, IDL } from "./idl";
 import type {
- InferenceStakingErrors,
+ InferenceStakingErrorName,
  DecodedStakingProgramInstruction,
- InferenceStakingInstructions,
+ InferenceStakingInstructionName,
  InstructionAccountsMap,
  OperatorPoolAccountStruct,
  PoolOverviewAccountStruct,
@@ -506,7 +506,7 @@ export class InferenceStakingProgramSdk {
 
  static getErrorNameFromTransactionLogs(
  logs: string[]
- ): InferenceStakingErrors | undefined {
+ ): InferenceStakingErrorName | undefined {
  for (const log of logs) {
  const errorName = IDL.errors.find(
  (e) =>
@@ -522,7 +522,7 @@ export class InferenceStakingProgramSdk {
 
  static getErrorNameFromTransactionError(
  error: unknown
- ): InferenceStakingErrors | undefined {
+ ): InferenceStakingErrorName | undefined {
  if (error instanceof AnchorError) {
  const { errorMessage, errorCode } = error.error;
  const errorName = IDL.errors.find(
@@ -538,15 +538,15 @@ export class InferenceStakingProgramSdk {
  }
 
  static getErrorMsgFromErrorName(
- errorName: InferenceStakingErrors | undefined
+ errorName: InferenceStakingErrorName | undefined
  ): string | undefined {
  const error = IDL.errors.find((e) => e.name === errorName);
  return error?.msg;
  }
 
  static getProgramErrorFromTransactionError(
  error: unknown
- ): InferenceStakingErrors | undefined {
+ ): InferenceStakingErrorName | undefined {
  const message = error instanceof Error ? error.message : null;
  if (message == null) {
  return undefined;
@@ -655,10 +655,10 @@ export class InferenceStakingProgramSdk {
  throw new Error("Failed to decode instruction");
  }
 
- const name = decodedIx.name as InferenceStakingInstructions;
+ const name = decodedIx.name as InferenceStakingInstructionName;
 
  const { args } =
- decodedIx.data as RawInstructionArgsMap[InferenceStakingInstructions];
+ decodedIx.data as RawInstructionArgsMap[InferenceStakingInstructionName];
 
  const accountsMeta: AccountMeta[] = instruction.accounts.map(
  (idx) => {
@@ -679,7 +679,7 @@ export class InferenceStakingProgramSdk {
  accountsMeta
  );
 
- const accounts: InstructionAccountsMap<InferenceStakingInstructions> =
+ const accounts: InstructionAccountsMap<InferenceStakingInstructionName> =
  {};
 
  for (const account of decodedAccounts?.accounts ?? []) {

sdk/src/types.ts

@@ -39,7 +39,7 @@ type ExtractErrorNames<T> = T extends { errors: { name: infer N }[] }
  ? N
  : never;
 
-export type InferenceStakingErrors = ExtractErrorNames<typeof IDL>;
+export type InferenceStakingErrorName = ExtractErrorNames<typeof IDL>;
 
 /** ******************************************************************************
  * Instruction Types
@@ -51,26 +51,28 @@ type ExtractInstructionNames<T> = T extends {
  ? N
  : never;
 
-export type InferenceStakingInstructions = ExtractInstructionNames<typeof IDL>;
+export type InferenceStakingInstructionName = ExtractInstructionNames<
+ typeof IDL
+>;
 
 /** ******************************************************************************
  * Decoded Instructions - Fixed for nested args
  ******************************************************************************* */
 
 // Original args type (what the method expects)
-type RawInstructionArgs<T extends InferenceStakingInstructions> =
+type RawInstructionArgs<T extends InferenceStakingInstructionName> =
  InstructionArgs<T>;
 
 // The raw (Borsch) decoded args structure
 export type RawInstructionArgsMap = {
- [K in InferenceStakingInstructions]: { args: RawInstructionArgs<K> };
+ [K in InferenceStakingInstructionName]: { args: RawInstructionArgs<K> };
 };
 
 export type InstructionArgsMap = {
- [K in InferenceStakingInstructions]: RawInstructionArgs<K>;
+ [K in InferenceStakingInstructionName]: RawInstructionArgs<K>;
 };
 
-export type InstructionAccountNames<T extends InferenceStakingInstructions> =
+export type InstructionAccountNames<T extends InferenceStakingInstructionName> =
  Extract<
  InferenceStaking["instructions"][number],
  { name: T }
@@ -86,14 +88,14 @@ export type AccountMetaWithName = {
  isWritable: boolean;
 };
 
-export type InstructionAccountsMap<T extends InferenceStakingInstructions> =
+export type InstructionAccountsMap<T extends InferenceStakingInstructionName> =
  Partial<Record<InstructionAccountNames<T>, AccountMetaWithName>>;
 
 export type DecodedStakingProgramInstruction = {
- [K in InferenceStakingInstructions]: {
+ [K in InferenceStakingInstructionName]: {
  name: K;
  accounts: InstructionAccountsMap<K>;
  args: InstructionArgsMap[K];
  instructionIndex: number;
  };
-}[InferenceStakingInstructions];
+}[InferenceStakingInstructionName];

tests/lib/utils.ts

@@ -16,7 +16,7 @@ import { Pool } from "pg";
 
 import { TokenEmissionsUtils } from "@sdk/src";
 import type {
- InferenceStakingErrors,
+ InferenceStakingErrorName,
  OperatorPoolAccountStruct,
  StakingRecordAccountStruct,
 } from "@sdk/src";
@@ -176,7 +176,7 @@ export const generateRewardsForEpoch = (
 
 export function assertStakingProgramError(
  error: unknown,
- code: InferenceStakingErrors
+ code: InferenceStakingErrorName
 ) {
  const errorName =
  InferenceStakingProgramSdk.getErrorNameFromTransactionError(error);