Multi query adjustments (#1732)

packages/api-derive/src/democracy/proposals.ts

@@ -64,20 +64,20 @@ function parse (api: ApiInterfaceRx, { depositors, proposals, preimages }: Resul
 export function proposals (api: ApiInterfaceRx): () => Observable<DeriveProposal[]> {
   return memo((): Observable<DeriveProposal[]> =>
     api.query.democracy?.publicProps
-      ? api.query.democracy
-        .publicProps<Proposals>()
-        .pipe(
-          switchMap((proposals) =>
-            combineLatest([
-              of(proposals),
-              api.query.democracy.preimages.multi<PreImage>(proposals.map(([, hash]): Hash => hash)),
-              api.query.democracy.depositOf.multi<Depositors>(proposals.map(([index]): PropIndex => index))
-            ])
-          ),
-          map(([proposals, preimages, depositors]): DeriveProposal[] =>
-            parse(api, { depositors, proposals, preimages })
-          )
+      ? api.query.democracy.publicProps<Proposals>().pipe(
+        switchMap((proposals) =>
+          combineLatest([
+            of(proposals),
+            api.query.democracy.preimages.multi<PreImage>(
+              proposals.map(([, hash]): Hash => hash)),
+            api.query.democracy.depositOf.multi<Depositors>(
+              proposals.map(([index]): PropIndex => index))
+          ])
+        ),
+        map(([proposals, preimages, depositors]): DeriveProposal[] =>
+          parse(api, { depositors, proposals, preimages })
         )
+      )
       : of([] as DeriveProposal[])
   );
 }

packages/api-derive/src/democracy/referendumInfos.ts

@@ -9,7 +9,7 @@ import BN from 'bn.js';
 import { Observable, combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { Option, Vec } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 
 import { memo } from '../util';
 import { retrieveInfo } from './referendumInfo';
@@ -17,9 +17,9 @@ import { retrieveInfo } from './referendumInfo';
 export function referendumInfos (api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable<DerivedReferendum[]> {
   return memo((ids: (BN | number)[] = []): Observable<DerivedReferendum[]> =>
     (
-      !ids || !ids.length
+      !ids?.length
         ? of([] as Option<ReferendumInfo>[])
-        : api.query.democracy.referendumInfoOf.multi(ids) as Observable<Vec<Option<ReferendumInfo>>>
+        : api.query.democracy.referendumInfoOf.multi<Option<ReferendumInfo>>(ids)
     ).pipe(
       switchMap((infos): Observable<(DerivedReferendum | null)[]> =>
         combineLatest(

packages/api-derive/src/democracy/referendumVotesFor.ts

@@ -19,7 +19,7 @@ export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | nu
       switchMap((votersFor): Observable<[Vec<AccountId>, Vote[], DerivedBalances[]]> =>
         combineLatest([
           of(votersFor),
-          api.derive.democracy.votes(referendumId as BN, votersFor),
+          api.derive.democracy.votes(referendumId, votersFor),
           api.derive.balances.votingBalances(votersFor)
         ])
       ),

packages/api-derive/src/democracy/votes.ts

@@ -10,12 +10,12 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 
-export function votes (api: ApiInterfaceRx): (referendumId: BN, accountIds?: AccountId[]) => Observable<Vote[]> {
-  return memo((referendumId: BN, accountIds: AccountId[] = []): Observable<Vote[]> =>
+export function votes (api: ApiInterfaceRx): (referendumId: BN | number, accountIds?: AccountId[]) => Observable<Vote[]> {
+  return memo((referendumId: BN | number, accountIds: AccountId[] = []): Observable<Vote[]> =>
     !accountIds || !accountIds.length
       ? of([] as Vote[])
       : api.query.democracy.voteOf.multi<Vote>(
-        accountIds.map((accountId): [BN, AccountId] =>
+        accountIds.map((accountId): [BN | number, AccountId] =>
           [referendumId, accountId]
         )
       )