Skip to content

Commit

Permalink
updated errors endpoint to use latest error metadata for fetchErrorIt…
Browse files Browse the repository at this point in the history
…em (#1205)
  • Loading branch information
marshacb committed Jan 30, 2023
1 parent a0f7d78 commit a13e8ca
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
14 changes: 6 additions & 8 deletions src/services/AbstractPalletsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import { ApiDecoration } from '@polkadot/api/types';
import { Option, Vec } from '@polkadot/types';
import {
ErrorMetadataLatest,
MetadataV13,
MetadataV14,
ModuleMetadataV13,
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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`
);
Expand All @@ -259,7 +257,7 @@ export abstract class AbstractPalletsService extends AbstractService {
errorItemMetaIdx,
Object.entries(errors)[
errorItemMetaIdx
] as unknown as PalletErrorMetadataV14,
] as unknown as ErrorMetadataLatest,
];
}

Expand Down
10 changes: 3 additions & 7 deletions src/services/pallets/PalletsErrorsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -59,7 +55,7 @@ export class PalletsErrorsService extends AbstractPalletsService {
palletMeta,
errorItemId,
metadataFieldType
) as PalletErrorMetadataV14;
) as ErrorMetadataLatest;

let palletErrorMetadata: ErrorMetadataLatest | undefined;
if (metadata) {
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit a13e8ca

Please sign in to comment.