quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove derive memos (#1538)

Browse Source 
* Remove derive memos

* Remove outer memo

* Over-eager replace
This commit is contained in:
Jaco Greeff
2019-11-03 11:38:36 +01:00
committed by GitHub
parent 0e037de1b1
commit 506b042f8c
44 changed files with 273 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-derive/src/chain/bestNumber.ts
+5 -6
View File
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name bestNumber
@@ -22,11 +22,10 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const bestNumber = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
return memo((): Observable<BlockNumber> =>
export function bestNumber (api: ApiInterfaceRx): () => Observable<BlockNumber> {
return (): Observable<BlockNumber> =>
api.rpc.chain.subscribeNewHeads().pipe(
map((header): BlockNumber => header.number.unwrap()),
drr()
)
);
}, true);
);
}
packages/api-derive/src/chain/bestNumberFinalized.ts
+5 -6
View File
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name bestNumberFinalized
@@ -23,11 +23,10 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const bestNumberFinalized = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
return memo((): Observable<BlockNumber> =>
export function bestNumberFinalized (api: ApiInterfaceRx): () => Observable<BlockNumber> {
return (): Observable<BlockNumber> =>
api.rpc.chain.subscribeFinalizedHeads().pipe(
map((header): BlockNumber => header.number.unwrap()),
drr()
)
);
}, true);
);
}
packages/api-derive/src/chain/bestNumberLag.ts
+5 -6
View File
@@ -9,7 +9,7 @@ import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { createType } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { bestNumber } from './bestNumber';
import { bestNumberFinalized } from './bestNumberFinalized';
@@ -26,11 +26,11 @@ import { bestNumberFinalized } from './bestNumberFinalized';
* });
* ```
*/
export const bestNumberLag = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
export function bestNumberLag (api: ApiInterfaceRx): () => Observable<BlockNumber> {
const bestNumberCall = bestNumber(api);
const bestNumberFinalizedCall = bestNumberFinalized(api);
return memo((): Observable<BlockNumber> =>
return (): Observable<BlockNumber> =>
combineLatest([
bestNumberCall(),
bestNumberFinalizedCall()
@@ -39,6 +39,5 @@ export const bestNumberLag = memo((api: ApiInterfaceRx): () => Observable<BlockN
createType('BlockNumber', bestNumber.sub(bestNumberFinalized))
),
drr()
)
);
}, true);
);
}
packages/api-derive/src/chain/getHeader.ts
+5 -6
View File
@@ -11,7 +11,7 @@ import { catchError, map } from 'rxjs/operators';
import { Vec } from '@polkadot/types';
import { HeaderExtended } from '../type';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name bestNumberFinalized
@@ -27,8 +27,8 @@ import { drr, memo } from '../util';
* console.log(`block #${number} was authored by ${author}`);
* ```
*/
export const getHeader = memo((api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable<HeaderExtended | undefined> => {
return memo((hash: Uint8Array | string): Observable<HeaderExtended | undefined> =>
export function getHeader (api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable<HeaderExtended | undefined> {
return (hash: Uint8Array | string): Observable<HeaderExtended | undefined> =>
combineLatest([
api.rpc.chain.getHeader(hash),
api.query.session.validators.at(hash) as Observable<Vec<AccountId>>
@@ -43,6 +43,5 @@ export const getHeader = memo((api: ApiInterfaceRx): (hash: Uint8Array | string)
of()
),
drr()
)
);
}, true);
);
}
packages/api-derive/src/chain/subscribeNewHeads.ts
+5 -6
View File
@@ -10,7 +10,7 @@ import { map } from 'rxjs/operators';
import { Vec } from '@polkadot/types';
import { HeaderExtended } from '../type';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name subscribeNewHeads
@@ -25,8 +25,8 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const subscribeNewHeads = memo((api: ApiInterfaceRx): () => Observable<HeaderExtended> => {
return memo((): Observable<HeaderExtended> =>
export function subscribeNewHeads (api: ApiInterfaceRx): () => Observable<HeaderExtended> {
return (): Observable<HeaderExtended> =>
combineLatest([
api.rpc.chain.subscribeNewHeads(),
api.query.session.validators<Vec<AccountId>>()
@@ -35,6 +35,5 @@ export const subscribeNewHeads = memo((api: ApiInterfaceRx): () => Observable<He
new HeaderExtended(header, validators)
),
drr()
)
);
}, true);
);
}