diff --git a/packages/api-derive/src/balances/fees.ts b/packages/api-derive/src/balances/fees.ts index 3d74caeafe..8a1de25056 100644 --- a/packages/api-derive/src/balances/fees.ts +++ b/packages/api-derive/src/balances/fees.ts @@ -12,7 +12,6 @@ import { drr } from '../util/drr'; export function fees (api: ApiInterface$Rx) { return (): Observable => { - // FIXME Remove fees checks, only use balances (fees is a removed module now) return (combineLatest([ api.query.balances.creationFee(), api.query.balances.existentialDeposit(), diff --git a/packages/api-derive/src/democracy/votes.ts b/packages/api-derive/src/democracy/votes.ts index 3731a50ec8..6bd0d72343 100644 --- a/packages/api-derive/src/democracy/votes.ts +++ b/packages/api-derive/src/democracy/votes.ts @@ -14,10 +14,7 @@ export function votes (api: ApiInterface$Rx) { return !accountIds || !accountIds.length ? of([]).pipe(drr()) : combineLatest( - // FIXME Convert to multi - accountIds.map( - (accountId) => api.query.democracy.voteOf([referendumId, accountId]) as Observable - ) + api.query.democracy.voteOf.multi(accountIds.map(accountId => [referendumId, accountId])) as Observable ).pipe( drr() ); diff --git a/packages/api-derive/src/staking/controllers.ts b/packages/api-derive/src/staking/controllers.ts index febe5b251d..53f14fba9f 100644 --- a/packages/api-derive/src/staking/controllers.ts +++ b/packages/api-derive/src/staking/controllers.ts @@ -11,10 +11,7 @@ import { drr } from '../util/drr'; function allBonds (api: ApiInterface$Rx, stashIds: Array) { return combineLatest( - // FIXME Convert to multi - stashIds.map((id) => - (api.query.staking.bonded(id) as Observable>) - ) + api.query.staking.bonded.multi(stashIds) as Observable> ); }