Remove double-up-drr (memo vs rpc) (#1541)

* Remove inner memo (no double-up on stringify)

* Validators-specific query

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

@@ -28,12 +28,11 @@ export function constructInfo (index: BN | number, optionInfo?: Option<Referendu
 }
 
 export const referendumInfo = memo((api: ApiInterfaceRx): (index: BN | number) => Observable<Option<ReferendumInfoExtended>> => {
-  return memo((index: BN | number): Observable<Option<ReferendumInfoExtended>> =>
-    (api.query.democracy.referendumInfoOf<Option<ReferendumInfo>>(index))
-      .pipe(
-        map((optionInfo): Option<ReferendumInfoExtended> =>
-          constructInfo(index, optionInfo)
-        ),
-        drr()
-      ));
+  return (index: BN | number): Observable<Option<ReferendumInfoExtended>> =>
+    api.query.democracy.referendumInfoOf<Option<ReferendumInfo>>(index).pipe(
+      map((optionInfo): Option<ReferendumInfoExtended> =>
+        constructInfo(index, optionInfo)
+      ),
+      drr()
+    );
 }, true);

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

@@ -15,7 +15,7 @@ import { drr, memo } from '../util';
 import { constructInfo } from './referendumInfo';
 
 export const referendumInfos = memo((api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable<Option<ReferendumInfoExtended>[]> => {
-  return memo((ids: (BN | number)[] = []): Observable<Option<ReferendumInfoExtended>[]> =>
+  return (ids: (BN | number)[] = []): Observable<Option<ReferendumInfoExtended>[]> =>
     (
       !ids || !ids.length
         ? of([] as Option<ReferendumInfo>[])
@@ -27,5 +27,5 @@ export const referendumInfos = memo((api: ApiInterfaceRx): (ids?: (BN | number)[
         )
       ),
       drr()
-    ));
+    );
 }, true);

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

@@ -19,7 +19,7 @@ export const referendumVotesFor = memo((api: ApiInterfaceRx): (referendumId: BN
   const votesCall = votes(api);
   const votingBalancesCall = votingBalances(api);
 
-  return memo((referendumId: BN | number): Observable<DerivedReferendumVote[]> =>
+  return (referendumId: BN | number): Observable<DerivedReferendumVote[]> =>
     api.query.democracy.votersFor<Vec<AccountId>>(referendumId).pipe(
       switchMap((votersFor): Observable<[Vec<AccountId>, Vote[], DerivedBalances[]]> =>
         combineLatest([
@@ -36,5 +36,5 @@ export const referendumVotesFor = memo((api: ApiInterfaceRx): (referendumId: BN
         } as unknown as DerivedReferendumVote))
       ),
       drr()
-    ));
+    );
 }, true);

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

@@ -17,7 +17,7 @@ import { referendumInfos } from './referendumInfos';
 export const referendums = memo((api: ApiInterfaceRx): () => Observable<Option<ReferendumInfoExtended>[]> => {
   const referendumInfosCall = referendumInfos(api);
 
-  return memo((): Observable<Option<ReferendumInfoExtended>[]> =>
+  return (): Observable<Option<ReferendumInfoExtended>[]> =>
     api.queryMulti<[ReferendumIndex, ReferendumIndex]>([
       api.query.democracy.nextTally,
       api.query.democracy.referendumCount
@@ -32,5 +32,5 @@ export const referendums = memo((api: ApiInterfaceRx): () => Observable<Option<R
           : of([])
       ),
       drr()
-    ));
+    );
 }, true);

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

@@ -11,7 +11,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
 import { drr, memo } from '../util';
 
 export const votes = memo((api: ApiInterfaceRx): (referendumId: BN, accountIds?: AccountId[]) => Observable<Vote[]> => {
-  return memo((referendumId: BN, accountIds: AccountId[] = []): Observable<Vote[]> =>
+  return (referendumId: BN, accountIds: AccountId[] = []): Observable<Vote[]> =>
     (
       !accountIds || !accountIds.length
         ? of([] as Vote[])
@@ -20,5 +20,5 @@ export const votes = memo((api: ApiInterfaceRx): (referendumId: BN, accountIds?:
             [referendumId, accountId]
           )
         )
-    ).pipe(drr()));
+    ).pipe(drr());
 }, true);