From 4e2fb23bdf7a89e76f83979e77580a06f8c547af Mon Sep 17 00:00:00 2001 From: Keith Ingram Date: Thu, 27 Feb 2020 11:57:26 -0500 Subject: [PATCH] Nullable api.derive.parachains.info (#1968) * api.derive.registrar.parachains * remove api parse * suggestions * some * parachains: overview/info * rm all * rm all * refine * null parachain info * isNone * isNone * isNone Co-authored-by: Jaco Greeff --- packages/api-derive/src/parachains/info.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/api-derive/src/parachains/info.ts b/packages/api-derive/src/parachains/info.ts index 26cc9b34ee..9ba503caad 100644 --- a/packages/api-derive/src/parachains/info.ts +++ b/packages/api-derive/src/parachains/info.ts @@ -58,7 +58,11 @@ function parseCollators (id: ParaId, collatorQueue: SelectedThreads | RetryQueue }); } -function parse (id: ParaId, [active, retryQueue, selectedThreads, didUpdate, info, pendingSwap, heads, relayDispatchQueue, watermarks]: Result): DeriveParachainFull { +function parse (id: ParaId, [active, retryQueue, selectedThreads, didUpdate, info, pendingSwap, heads, relayDispatchQueue, watermarks]: Result): DeriveParachainFull | null { + if (info.isNone) { + return null; + } + return { active: parseActive(id, active), didUpdate: didUpdate.isSome @@ -66,7 +70,7 @@ function parse (id: ParaId, [active, retryQueue, selectedThreads, didUpdate, inf : false, heads, id, - info: { id, ...info.unwrapOr(null) } as DeriveParachainInfo, + info: { id, ...info.unwrap() } as DeriveParachainInfo, pendingSwapId: pendingSwap.unwrapOr(null), relayDispatchQueue, retryCollators: parseCollators(id, retryQueue), @@ -90,7 +94,7 @@ export function info (api: ApiInterfaceRx): (id: ParaId | number) => Observable< [api.query.parachains.watermarks, id] ]) .pipe( - map((result: Result): DeriveParachainFull => + map((result: Result): DeriveParachainFull | null => parse(createType(api.registry, 'ParaId', id), result) ) )