Split derive.staking.currentPoints from overview (#2140)

packages/api-derive/src/staking/currentPoints.ts

@@ -0,0 +1,42 @@
+// Copyright 2017-2020 @polkadot/api-derive authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { AccountId, EraPoints, EraRewardPoints, RewardPoint } from '@polkadot/types/interfaces';
+import { ApiInterfaceRx } from '@polkadot/api/types';
+
+import { Observable, of } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+
+import { memo } from '../util';
+
+function retrievePointsPrev (api: ApiInterfaceRx, currentElected: AccountId[]): Observable<EraRewardPoints> {
+  return api.query.staking.currentEraPointsEarned<EraPoints>().pipe(
+    map(({ individual, total }): EraRewardPoints =>
+      api.registry.createType('EraRewardPoints', {
+        individual: new Map<AccountId, RewardPoint>(
+          individual
+            .map((points): RewardPoint => api.registry.createType('RewardPoint', points))
+            .map((points, index): [AccountId, RewardPoint] => [currentElected[index], points])
+        ),
+        total
+      })
+    )
+  );
+}
+
+/**
+ * @description Retrieve the staking overview, including elected and points earned
+ */
+export function currentPoints (api: ApiInterfaceRx): () => Observable<EraRewardPoints> {
+  return memo((): Observable<EraRewardPoints> =>
+    api.derive.staking.overview().pipe(
+      switchMap(({ activeEra, nextElected }) =>
+        api.query.staking.erasRewardPoints
+          ? api.query.staking.erasRewardPoints<EraRewardPoints>(activeEra)
+          : api.query.staking.currentEraPointsEarned
+            ? retrievePointsPrev(api, nextElected)
+            : of(api.registry.createType('EraRewardPoints'))
+      )
+    ));
+}

packages/api-derive/src/staking/index.ts

@@ -3,6 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 export * from './account';
+export * from './currentPoints';
 export * from './erasExposure';
 export * from './erasHistoric';
 export * from './erasPoints';

packages/api-derive/src/staking/overview.ts

@@ -2,30 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AccountId, EraPoints, EraRewardPoints, RewardPoint } from '@polkadot/types/interfaces';
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { DeriveStakingOverview } from '../types';
 
-import { Observable, combineLatest, of } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { Observable, combineLatest } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { memo } from '../util';
 
-function retrievePointsPrev (api: ApiInterfaceRx, currentElected: AccountId[]): Observable<EraRewardPoints> {
-  return api.query.staking.currentEraPointsEarned<EraPoints>().pipe(
-    map(({ individual, total }): EraRewardPoints =>
-      api.registry.createType('EraRewardPoints', {
-        individual: new Map<AccountId, RewardPoint>(
-          individual
-            .map((points): RewardPoint => api.registry.createType('RewardPoint', points))
-            .map((points, index): [AccountId, RewardPoint] => [currentElected[index], points])
-        ),
-        total
-      })
-    )
-  );
-}
-
 /**
  * @description Retrieve the staking overview, including elected and points earned
  */
@@ -35,18 +19,10 @@ export function overview (api: ApiInterfaceRx): () => Observable<DeriveStakingOv
       api.derive.session.indexes(),
       api.derive.staking.validators()
     ]).pipe(
-      switchMap(([indexes, { nextElected, validators }]) =>
-        combineLatest([
-          of({ ...indexes, nextElected, validators }),
-          api.query.staking.erasRewardPoints
-            ? api.query.staking.erasRewardPoints<EraRewardPoints>(indexes.activeEra)
-            : api.query.staking.currentEraPointsEarned
-              ? retrievePointsPrev(api, nextElected)
-              : of(api.registry.createType('EraRewardPoints'))
-        ])
-      ),
-      map(([info, eraPoints]): DeriveStakingOverview => ({
-        ...info, eraPoints
+      map(([indexes, { nextElected, validators }]): DeriveStakingOverview => ({
+        ...indexes,
+        nextElected,
+        validators
       }))
     ));
 }

packages/api-derive/src/staking/types.ts

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AccountId, Balance, EraIndex, EraRewardPoints, Exposure, Keys, RewardDestination, RewardPoint, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces';
+import { AccountId, Balance, EraIndex, Exposure, Keys, RewardDestination, RewardPoint, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces';
 import { DeriveSessionIndexes } from '../session/types';
 
 import BN from 'bn.js';
@@ -127,7 +127,6 @@ export interface DeriveStakingAccount extends DeriveStakingQuery {
 }
 
 export interface DeriveStakingOverview extends DeriveSessionIndexes {
-  eraPoints: EraRewardPoints;
   nextElected: AccountId[];
   validators: AccountId[];
 }