From 79763f28810cea7d60b3a271b19f9a386ab6c4f7 Mon Sep 17 00:00:00 2001
From: marshacb <cameron.marshall12@gmail.com>
Date: Thu, 26 Jan 2023 14:41:23 -0500
Subject: [PATCH] updated errors endpoint to use latest error metadata for
 fetchErrorItem

---
 src/services/AbstractPalletsService.ts       | 14 ++++++--------
 src/services/pallets/PalletsErrorsService.ts | 10 +++-------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/services/AbstractPalletsService.ts b/src/services/AbstractPalletsService.ts
index 1b47aff40..5d8a1b549 100644
--- a/src/services/AbstractPalletsService.ts
+++ b/src/services/AbstractPalletsService.ts
@@ -17,6 +17,7 @@
 import { ApiDecoration } from '@polkadot/api/types';
 import { Option, Vec } from '@polkadot/types';
 import {
+	ErrorMetadataLatest,
 	MetadataV13,
 	MetadataV14,
 	ModuleMetadataV13,
@@ -199,13 +200,10 @@ export abstract class AbstractPalletsService extends AbstractService {
 		palletMeta: PalletMetadataV14 | ModuleMetadataV13,
 		palletItemId: string,
 		metadataFieldType: string
-	):
-		| PalletErrorMetadataV14
-		| StorageEntryMetadataV13
-		| StorageEntryMetadataV14 {
+	): ErrorMetadataLatest | StorageEntryMetadataV13 | StorageEntryMetadataV14 {
 		let palletItemIdx = -1;
 		let palletItemMeta:
-			| PalletErrorMetadataV14
+			| ErrorMetadataLatest
 			| StorageEntryMetadataV13
 			| StorageEntryMetadataV14;
 
@@ -238,11 +236,11 @@ export abstract class AbstractPalletsService extends AbstractService {
 		palletMeta: PalletMetadataV14,
 		errorItemMetaIdx: number,
 		errorItemId: string
-	): [number, PalletErrorMetadataV14] {
+	): [number, ErrorMetadataLatest] {
 		const palletName = stringCamelCase(palletMeta.name);
 		const errors = historicApi.errors[palletName];
 
-		if ((palletMeta.errors as unknown as PalletErrorMetadataV14).isEmpty) {
+		if ((palletMeta.errors as unknown as ErrorMetadataLatest).isEmpty) {
 			throw new InternalServerError(
 				`No error items found in ${palletMeta.name.toString()}'s metadadta`
 			);
@@ -259,7 +257,7 @@ export abstract class AbstractPalletsService extends AbstractService {
 			errorItemMetaIdx,
 			Object.entries(errors)[
 				errorItemMetaIdx
-			] as unknown as PalletErrorMetadataV14,
+			] as unknown as ErrorMetadataLatest,
 		];
 	}
 
diff --git a/src/services/pallets/PalletsErrorsService.ts b/src/services/pallets/PalletsErrorsService.ts
index 01f0f7b6d..f90f2017a 100644
--- a/src/services/pallets/PalletsErrorsService.ts
+++ b/src/services/pallets/PalletsErrorsService.ts
@@ -16,11 +16,7 @@
 
 import { ApiDecoration } from '@polkadot/api/types';
 import { Text } from '@polkadot/types';
-import {
-	BlockHash,
-	ErrorMetadataLatest,
-	PalletErrorMetadataV14,
-} from '@polkadot/types/interfaces';
+import { BlockHash, ErrorMetadataLatest } from '@polkadot/types/interfaces';
 import { IsError } from '@polkadot/types/metadata/decorate/types';
 import { stringCamelCase } from '@polkadot/util';
 import { IPalletErrors, IPalletErrorsItem } from 'src/types/responses';
@@ -59,7 +55,7 @@ export class PalletsErrorsService extends AbstractPalletsService {
 			palletMeta,
 			errorItemId,
 			metadataFieldType
-		) as PalletErrorMetadataV14;
+		) as ErrorMetadataLatest;
 
 		let palletErrorMetadata: ErrorMetadataLatest | undefined;
 		if (metadata) {
@@ -98,7 +94,7 @@ export class PalletsErrorsService extends AbstractPalletsService {
 		const errors = historicApi.errors[parsedPalletName];
 
 		let items: [] | ErrorMetadataLatest[] | Text[];
-		if ((palletMeta.errors as unknown as PalletErrorMetadataV14).isEmpty) {
+		if ((palletMeta.errors as unknown as ErrorMetadataLatest).isEmpty) {
 			items = [];
 		} else if (onlyIds) {
 			items = Object.entries(errors).map(