From 37456fe5aa14bfbd2b9024fa1a741866830979bd Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 9 Oct 2018 13:58:39 +0200 Subject: [PATCH] Map Vector -> Array for queries --- packages/api-observable/src/Queries.ts | 28 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/api-observable/src/Queries.ts b/packages/api-observable/src/Queries.ts index 1ba73fda79e2..edfab5b44204 100644 --- a/packages/api-observable/src/Queries.ts +++ b/packages/api-observable/src/Queries.ts @@ -9,7 +9,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import storage from '@polkadot/storage/static'; import { AccountId, Balance, bool as Bool, BlockNumber, Index, Moment, Perbill, PropIndex, ReferendumIndex, u32 } from '@polkadot/types/index'; -import { Tuple } from '@polkadot/types/codec'; +import { Tuple, Vector } from '@polkadot/types/codec'; import ApiBase from './Base'; import { RxProposal, RxProposalDeposits, RxReferendum } from './classes'; @@ -62,7 +62,7 @@ export default class ApiQueries extends ApiBase { .rawStorage(storage.democracy.publicProps) .pipe( // @ts-ignore After upgrade to 6.3.2 - map((proposals: Array = []) => + map((proposals: Vector = []) => proposals .map((result: Tuple): RxProposal | undefined => result @@ -102,8 +102,10 @@ export default class ApiQueries extends ApiBase { .rawStorage(storage.democracy.votersFor, index) .pipe( // @ts-ignore After upgrade to 6.3.2 - map((voters: Array = []) => - voters + map((voters: Vector = []) => + voters.map((accountId) => + accountId + ) ) ); } @@ -170,8 +172,10 @@ export default class ApiQueries extends ApiBase { .rawStorage(storage.session.validators) .pipe( // @ts-ignore After upgrade to 6.3.2 - map((validators: Array = []) => - validators + map((validators: Vector = []) => + validators.map((authorityId) => + authorityId + ) ) ); } @@ -181,8 +185,10 @@ export default class ApiQueries extends ApiBase { .rawStorage(storage.staking.intentions) .pipe( // @ts-ignore After upgrade to 6.3.2 - map((intentions: Array = []) => - intentions + map((intentions: Vector = []) => + intentions.map((accountId) => + accountId + ) ) ); } @@ -192,8 +198,10 @@ export default class ApiQueries extends ApiBase { .rawStorage(storage.staking.nominatorsFor, address) .pipe( // @ts-ignore After upgrade to 6.3.2 - map((nominators: Array = []) => - nominators + map((nominators: Vector = []) => + nominators.map((accountId) => + accountId + ) ) ); }