From 47767ea42486517b3ddb57ca93556b3c886c31bb Mon Sep 17 00:00:00 2001 From: Jaco Date: Thu, 3 Mar 2022 09:19:33 +0100 Subject: [PATCH] Align entry retrieval with key retrieval (#7096) --- packages/page-assets/src/useAssetIds.ts | 5 +- packages/page-parachains/src/useOwnedIds.ts | 47 ++++++++++--------- packages/page-parachains/src/useProposals.ts | 15 +++--- .../page-parachains/src/useUpcomingIds.ts | 38 +++++++-------- packages/page-treasury/src/useTipHashes.ts | 6 ++- packages/react-hooks/src/useMapEntries.ts | 3 +- 6 files changed, 62 insertions(+), 52 deletions(-) diff --git a/packages/page-assets/src/useAssetIds.ts b/packages/page-assets/src/useAssetIds.ts index 00644b8317..86c8ff79f7 100644 --- a/packages/page-assets/src/useAssetIds.ts +++ b/packages/page-assets/src/useAssetIds.ts @@ -15,7 +15,10 @@ const options = { function useAssetIdsImpl (): AssetId[] | undefined { const { api } = useApi(); - const trigger = useEventTrigger([api.events.assets.Created, api.events.assets.Destroyed]); + const trigger = useEventTrigger([ + api.events.assets.Created, + api.events.assets.Destroyed + ]); return useMapKeys(api.query.assets.asset, options, trigger.blockHash); } diff --git a/packages/page-parachains/src/useOwnedIds.ts b/packages/page-parachains/src/useOwnedIds.ts index 67ef2b161d..82aefdd446 100644 --- a/packages/page-parachains/src/useOwnedIds.ts +++ b/packages/page-parachains/src/useOwnedIds.ts @@ -20,28 +20,30 @@ interface Owned { owned: OwnedIdPartial[]; } -function extractIds (entries: [StorageKey<[ParaId]>, Option][]): Owned { - const owned = entries - .map(([{ args: [paraId] }, optInfo]): OwnedIdPartial | null => { - if (optInfo.isNone) { - return null; - } +const entriesOptions = { + transform: (entries: [StorageKey<[ParaId]>, Option][]): Owned => { + const owned = entries + .map(([{ args: [paraId] }, optInfo]): OwnedIdPartial | null => { + if (optInfo.isNone) { + return null; + } - const paraInfo = optInfo.unwrap(); + const paraInfo = optInfo.unwrap(); - return { - manager: paraInfo.manager.toString(), - paraId, - paraInfo - }; - }) - .filter((id): id is OwnedIdPartial => !!id); + return { + manager: paraInfo.manager.toString(), + paraId, + paraInfo + }; + }) + .filter((id): id is OwnedIdPartial => !!id); - return { - ids: owned.map(({ paraId }) => paraId), - owned - }; -} + return { + ids: owned.map(({ paraId }) => paraId), + owned + }; + } +}; const hashesOption = { transform: ([[paraIds], optHashes]: [[ParaId[]], Option[]]) => @@ -55,8 +57,11 @@ const hashesOption = { function useOwnedIdsImpl (): OwnedId[] { const { api } = useApi(); const { allAccounts } = useAccounts(); - const trigger = useEventTrigger([api.events.registrar.Registered, api.events.registrar.Reserved]); - const unfiltered = useMapEntries(api.query.registrar.paras, { at: trigger.blockHash, transform: extractIds }); + const trigger = useEventTrigger([ + api.events.registrar.Registered, + api.events.registrar.Reserved + ]); + const unfiltered = useMapEntries(api.query.registrar.paras, entriesOptions, trigger.blockHash); const hashes = useCall(api.query.paras.currentCodeHash.multi, [unfiltered ? unfiltered.ids : []], hashesOption); return useMemo( diff --git a/packages/page-parachains/src/useProposals.ts b/packages/page-parachains/src/useProposals.ts index cd25a3a95a..ae5feb9db7 100644 --- a/packages/page-parachains/src/useProposals.ts +++ b/packages/page-parachains/src/useProposals.ts @@ -25,19 +25,20 @@ const proposalOpts = { keys.map(({ args: [id] }) => id) }; -function extractScheduled (entries: [StorageKey<[SessionIndex]>, ParaId[]][]): Scheduled[] { - return entries.map(([{ args: [sessionIndex] }, scheduledIds]) => ({ - scheduledIds, - sessionIndex - })); -} +const scheduledOpts = { + transform: (entries: [StorageKey<[SessionIndex]>, ParaId[]][]): Scheduled[] => + entries.map(([{ args: [sessionIndex] }, scheduledIds]) => ({ + scheduledIds, + sessionIndex + })) +}; function useProposalsImpl (): Proposals | undefined { const { api } = useApi(); const mountedRef = useIsMountedRef(); const trigger = useEventTrigger([api.events.proposeParachain?.ProposeParachain]); const proposalIds = useMapKeys(api.query.proposeParachain?.proposals, proposalOpts, trigger.blockHash); - const scheduled = useMapEntries(api.query.proposeParachain?.scheduledProposals, { at: trigger.blockHash, transform: extractScheduled }); + const scheduled = useMapEntries(api.query.proposeParachain?.scheduledProposals, scheduledOpts, trigger.blockHash); const [sessionIndex, approvedIds] = useCallMulti([ api.query.session.currentIndex, api.query.proposeParachain?.approvedProposals diff --git a/packages/page-parachains/src/useUpcomingIds.ts b/packages/page-parachains/src/useUpcomingIds.ts index 23d7c78ce9..b36f7947c6 100644 --- a/packages/page-parachains/src/useUpcomingIds.ts +++ b/packages/page-parachains/src/useUpcomingIds.ts @@ -7,23 +7,24 @@ import type { PolkadotRuntimeParachainsParasParaLifecycle } from '@polkadot/type import { createNamedHook, useApi, useEventTrigger, useMapEntries } from '@polkadot/react-hooks'; -function extractIds (entries: [StorageKey<[ParaId]>, Option][]): ParaId[] { - return entries - .map(([{ args: [paraId] }, optValue]): ParaId | null => { - const value = optValue.unwrapOr(null); +const options = { + transform: (entries: [StorageKey<[ParaId]>, Option][]): ParaId[] => + entries + .map(([{ args: [paraId] }, optValue]): ParaId | null => { + const value = optValue.unwrapOr(null); - return value && ( - value.isParathread || - value.isUpgradingParathread || - value.isOffboardingParathread || - value.isOnboarding - ) - ? paraId - : null; - }) - .filter((paraId): paraId is ParaId => !!paraId) - .sort((a, b) => a.cmp(b)); -} + return value && ( + value.isParathread || + value.isUpgradingParathread || + value.isOffboardingParathread || + value.isOnboarding + ) + ? paraId + : null; + }) + .filter((paraId): paraId is ParaId => !!paraId) + .sort((a, b) => a.cmp(b)) +}; function useUpomingIdsImpl (): ParaId[] | undefined { const { api } = useApi(); @@ -32,10 +33,7 @@ function useUpomingIdsImpl (): ParaId[] | undefined { api.events.registrar.Registered ]); - return useMapEntries(api.query.paras.paraLifecycles, { - at: trigger.blockHash, - transform: extractIds - }); + return useMapEntries(api.query.paras.paraLifecycles, options, trigger.blockHash); } export default createNamedHook('useUpomingIds', useUpomingIdsImpl); diff --git a/packages/page-treasury/src/useTipHashes.ts b/packages/page-treasury/src/useTipHashes.ts index 2a538e5209..78222d75d1 100644 --- a/packages/page-treasury/src/useTipHashes.ts +++ b/packages/page-treasury/src/useTipHashes.ts @@ -13,7 +13,11 @@ const options = { function useTipHashesImpl (): string[] | undefined { const { api } = useApi(); - const trigger = useEventTrigger([api.events.tips?.NewTip, api.events.tips?.TipClosed, api.events.tips?.TipRetracted]); + const trigger = useEventTrigger([ + api.events.tips?.NewTip, + api.events.tips?.TipClosed, + api.events.tips?.TipRetracted + ]); return useMapKeys((api.query.tips || api.query.treasury)?.tips, options, trigger.blockHash); } diff --git a/packages/react-hooks/src/useMapEntries.ts b/packages/react-hooks/src/useMapEntries.ts index d4be5034c1..a9194f86ed 100644 --- a/packages/react-hooks/src/useMapEntries.ts +++ b/packages/react-hooks/src/useMapEntries.ts @@ -6,12 +6,11 @@ import type { QueryableStorageEntry } from '@polkadot/api/types'; import { useEffect, useState } from 'react'; interface Options { - at?: string | null | false; transform?: (value: any[]) => T; } // FIXME This is generic, we cannot really use createNamedHook -export function useMapEntries (entry?: QueryableStorageEntry<'promise'> | null | false, { at, transform }: Options = {}): T | undefined { +export function useMapEntries (entry?: QueryableStorageEntry<'promise'> | null | false, { transform }: Options = {}, at?: string | null | false): T | undefined { const [state, setState] = useState(); useEffect((): void => {