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

Revert "modified api-derive balances to allow use of custom balance storages … (#3223)" (#3238)

Browse Source 
This reverts commit ab8b381d8b.
This commit is contained in:
Jaco Greeff
2021-02-28 10:12:54 +01:00
committed by GitHub
parent c72f976895
commit 886f3a3c08
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-derive/src/balances/account.ts
+1 -7
View File
@@ -55,13 +55,7 @@ function queryBalancesFree (api: ApiInterfaceRx, accountId: AccountId): Observab
}
function queryBalancesAccount (api: ApiInterfaceRx, accountId: AccountId, modules: string[] = ['balances']): Observable<Result> {
const balances = modules.map(
(m): QueryableStorageMultiArg<'rxjs'> => [
(api.derive[m as 'balances'] as unknown as ApiInterfaceRx['query']['balances'])?.account ?? api.query[m].account,
accountId
]
);
const balances = modules.map((m): QueryableStorageMultiArg<'rxjs'> => [api.query[m].account, accountId]);
const extract = (data: AccountData[]) =>
data.map(({ feeFrozen, free, miscFrozen, reserved }): BalanceResult => [free, reserved, feeFrozen, miscFrozen]);
packages/api-derive/src/balances/all.ts
+2 -8
View File
@@ -112,17 +112,11 @@ function queryOld (api: ApiInterfaceRx, accountId: AccountId): Observable<Result
);
}
const isNonNullable = <T>(nullable: T): nullable is NonNullable<T> => !!nullable;
// current (balances, vesting)
function queryCurrent (api: ApiInterfaceRx, accountId: AccountId, balanceInstances: string[] = ['balances']): Observable<ResultBalance> {
const lockCalls = balanceInstances.map(
(m): ApiInterfaceRx['query']['balances']['locks'] | undefined =>
(api.derive[m as 'balances'] as unknown as ApiInterfaceRx['query']['balances'])?.locks ?? api.query[m as 'balances']?.locks
);
const lockCalls = balanceInstances.map((m) => api.query[m].locks);
const lockEmpty = lockCalls.map((c) => !c);
const lockQueries = lockCalls.filter(isNonNullable).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]);
const lockQueries = lockCalls.filter((c) => c).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]);
return (
api.query.vesting?.vesting