Vector -> Array for query results (#229)

* Map Vector -> Array for queries

* FIXME
This commit is contained in:
Jaco Greeff
2018-10-09 14:08:43 +02:00
committed by GitHub
parent 4986897de9
commit 200253829b
+20 -10
View File
@@ -9,11 +9,13 @@ 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';
// FIXME Revert Vector -> Array mappings in here once https://github.com/polkadot-js/api/pull/172 is in
// Perform storage queries to the API endpoints.
export default class ApiQueries extends ApiBase {
accountNonce = (address: AccountId | string): Observable<Index | undefined> => {
@@ -62,7 +64,7 @@ export default class ApiQueries extends ApiBase {
.rawStorage(storage.democracy.publicProps)
.pipe(
// @ts-ignore After upgrade to 6.3.2
map((proposals: Array<Tuple> = []) =>
map((proposals: Vector<Tuple> = []) =>
proposals
.map((result: Tuple): RxProposal | undefined =>
result
@@ -102,8 +104,10 @@ export default class ApiQueries extends ApiBase {
.rawStorage(storage.democracy.votersFor, index)
.pipe(
// @ts-ignore After upgrade to 6.3.2
map((voters: Array<AccountId> = []) =>
voters
map((voters: Vector<AccountId> = []) =>
voters.map((accountId) =>
accountId
)
)
);
}
@@ -170,8 +174,10 @@ export default class ApiQueries extends ApiBase {
.rawStorage(storage.session.validators)
.pipe(
// @ts-ignore After upgrade to 6.3.2
map((validators: Array<AccountId> = []) =>
validators
map((validators: Vector<AccountId> = []) =>
validators.map((authorityId) =>
authorityId
)
)
);
}
@@ -181,8 +187,10 @@ export default class ApiQueries extends ApiBase {
.rawStorage(storage.staking.intentions)
.pipe(
// @ts-ignore After upgrade to 6.3.2
map((intentions: Array<AccountId> = []) =>
intentions
map((intentions: Vector<AccountId> = []) =>
intentions.map((accountId) =>
accountId
)
)
);
}
@@ -192,8 +200,10 @@ export default class ApiQueries extends ApiBase {
.rawStorage(storage.staking.nominatorsFor, address)
.pipe(
// @ts-ignore After upgrade to 6.3.2
map((nominators: Array<AccountId> = []) =>
nominators
map((nominators: Vector<AccountId> = []) =>
nominators.map((accountId) =>
accountId
)
)
);
}