From 1834a25ac23440bdee1fcf219050378273272532 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 29 May 2018 12:12:53 +0200 Subject: [PATCH] Update from new @polkadot/params --- lerna.json | 2 +- packages/api-format/package.json | 6 +- packages/api-format/src/input.js | 4 +- packages/api-format/src/input.spec.js | 8 +- packages/api-provider/package.json | 4 +- packages/api-provider/src/mock/mocks.js | 8 +- packages/api-provider/src/mock/state.js | 9 +- packages/api-rx/package.json | 6 +- packages/api/package.json | 10 +- packages/api/src/create/interface.js | 7 +- packages/api/src/create/interface.spec.js | 12 +-- packages/api/src/create/methodSend.spec.js | 8 +- packages/api/src/create/params.js | 5 +- packages/api/src/create/params.spec.js | 12 +-- yarn.lock | 102 +++++++++------------ 15 files changed, 94 insertions(+), 109 deletions(-) diff --git a/lerna.json b/lerna.json index 687de70132b1..daf33155af54 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.12.15" + "version": "0.13.0" } diff --git a/packages/api-format/package.json b/packages/api-format/package.json index bbe9dc501095..605feb9ce33d 100644 --- a/packages/api-format/package.json +++ b/packages/api-format/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api-format", - "version": "0.12.15", + "version": "0.13.0", "description": "Input/Output formatters for JsonRPC exchange", "main": "index.js", "keywords": [ @@ -31,8 +31,8 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/jsonrpc": "^0.16.15", - "@polkadot/primitives-json": "^0.16.15", + "@polkadot/jsonrpc": "^0.17.2", + "@polkadot/primitives-json": "^0.17.2", "@polkadot/util": "^0.22.2", "@polkadot/util-keyring": "^0.22.2" } diff --git a/packages/api-format/src/input.js b/packages/api-format/src/input.js index cd17339094ec..daf8e2dfcb24 100644 --- a/packages/api-format/src/input.js +++ b/packages/api-format/src/input.js @@ -3,7 +3,7 @@ // of the ISC license. See the LICENSE file for details. // @flow -import type { Params, Param$Types } from '@polkadot/params/types'; +import type { Params } from '@polkadot/params/types'; const addressDecode = require('@polkadot/util-keyring/address/decode'); const bytesEncode = require('@polkadot/primitives-json/bytes/encode'); @@ -20,7 +20,7 @@ const formatters = { // flowlint-next-line unclear-type:off module.exports = function formatInputs (params: Params, values: Array): Array { - const types: Array = Object.keys(params).map((name) => params[name].type); + const types = params.map(({ type }) => type); return format(formatters, types, values); }; diff --git a/packages/api-format/src/input.spec.js b/packages/api-format/src/input.spec.js index fa90669b60ce..60f96955c485 100644 --- a/packages/api-format/src/input.spec.js +++ b/packages/api-format/src/input.spec.js @@ -8,10 +8,10 @@ describe('formatInputs', () => { it('formats each value in an array', () => { expect( formatInputs( - { - foo: { type: 'Bytes' }, - bar: { type: 'Hash' } - }, + [ + { name: 'foo', type: 'Bytes' }, + { name: 'bar', type: 'Hash' } + ], [ new Uint8Array([0x12, 0x34]), new Uint8Array([0xab, 0xcd]) diff --git a/packages/api-provider/package.json b/packages/api-provider/package.json index dee0ba08c686..80ea1410d348 100644 --- a/packages/api-provider/package.json +++ b/packages/api-provider/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api-provider", - "version": "0.12.15", + "version": "0.13.0", "description": "Transport providers for the API", "main": "index.js", "keywords": [ @@ -35,7 +35,7 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/storage-substrate": "^0.16.15", + "@polkadot/storage": "^0.17.2", "@polkadot/util": "^0.22.2", "@polkadot/util-crypto": "^0.22.2", "@polkadot/util-keyring": "^0.22.2", diff --git a/packages/api-provider/src/mock/mocks.js b/packages/api-provider/src/mock/mocks.js index d2592f7712a5..06053a8b3fbd 100644 --- a/packages/api-provider/src/mock/mocks.js +++ b/packages/api-provider/src/mock/mocks.js @@ -13,7 +13,7 @@ import type { MockState, MockState$Subscription$Callback } from './types'; const BN = require('bn.js'); const headerEncode = require('@polkadot/primitives-json/header/encode'); const createKey = require('@polkadot/storage/key'); -const state = require('@polkadot/storage-substrate/keys'); +const state = require('@polkadot/storage'); const bnToU8a = require('@polkadot/util/bn/toU8a'); const u8aToHex = require('@polkadot/util/u8a/toHex'); const randomAsU8a = require('@polkadot/util-crypto/random/asU8a'); @@ -76,11 +76,11 @@ module.exports = function mocks ({ emitter, storage, subscriptions }: MockState) newHead = makeBlockHeader(newHead.number); keyring.getPairs().forEach(({ publicKey }: KeyringPair, index: number) => { - setStorageBn(storage, state.staking.keys.freeBalanceOf, newHead.number.muln(3).iaddn(index), publicKey()); - setStorageBn(storage, state.system.keys.accountIndexOf, newHead.number.addn(index), publicKey()); + setStorageBn(storage, state.staking.public.freeBalanceOf, newHead.number.muln(3).iaddn(index), publicKey()); + setStorageBn(storage, state.system.public.accountIndexOf, newHead.number.addn(index), publicKey()); }); - setStorageBn(storage, state.timestamp.keys.current, Math.floor(Date.now() / 1000)); + setStorageBn(storage, state.timestamp.public.current, Math.floor(Date.now() / 1000)); updateSubs(subscriptions, 'subscribe_newHead', headerEncode(newHead)); }, 5000); diff --git a/packages/api-provider/src/mock/state.js b/packages/api-provider/src/mock/state.js index 17d2d6ab5c3e..782fbf26f4e1 100644 --- a/packages/api-provider/src/mock/state.js +++ b/packages/api-provider/src/mock/state.js @@ -13,8 +13,8 @@ const l = require('@polkadot/util/logger')('api-mock'); const SUBSCRIPTIONS = Array.prototype.concat.apply( [], Object.keys(interfaces).map((section) => { return Object - .keys(interfaces[section].methods) - .filter((method) => interfaces[section].methods[method].isSubscription) + .keys(interfaces[section].public) + .filter((method) => interfaces[section].public[method].isSubscription) .map((method) => `subscribe_${method}`); }) ); @@ -25,7 +25,10 @@ const REQUESTS = { // flowlint-next-line unclear-type:off storage[((params[0]: any): string)] ); - } + }, + 'system_chain': (): string => 'mockChain', + 'system_name': (): string => 'mockClient', + 'system_version': (): string => '9.8.7' }; module.exports = function state (): MockState { diff --git a/packages/api-rx/package.json b/packages/api-rx/package.json index 62ef98954874..15b70cd91bd2 100644 --- a/packages/api-rx/package.json +++ b/packages/api-rx/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api-rx", - "version": "0.12.15", + "version": "0.13.0", "description": "An RxJs wrapper around the Polkadot JS API", "main": "index.js", "keywords": [ @@ -31,8 +31,8 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/api": "^0.12.15", - "@polkadot/api-provider": "^0.12.15", + "@polkadot/api": "^0.13.0", + "@polkadot/api-provider": "^0.13.0", "rxjs": "^5.5.10" } } diff --git a/packages/api/package.json b/packages/api/package.json index 343a62568e32..7b1a2471243e 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api", - "version": "0.12.15", + "version": "0.13.0", "description": "A JavaScript wrapper for the Polkadot JsonRPC interface", "main": "index.js", "keywords": [ @@ -31,10 +31,10 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/api-format": "^0.12.15", - "@polkadot/api-provider": "^0.12.15", - "@polkadot/jsonrpc": "^0.16.15", - "@polkadot/params": "^0.16.15", + "@polkadot/api-format": "^0.13.0", + "@polkadot/api-provider": "^0.13.0", + "@polkadot/jsonrpc": "^0.17.2", + "@polkadot/params": "^0.17.2", "@polkadot/util": "^0.22.2" } } diff --git a/packages/api/src/create/interface.js b/packages/api/src/create/interface.js index 0ecb9ccebbd0..2e2d53b2e630 100644 --- a/packages/api/src/create/interface.js +++ b/packages/api/src/create/interface.js @@ -14,7 +14,7 @@ const methodSubscribe = require('./methodSubscribe'); module.exports = function createInterface (provider: ProviderInterface, section: Interface$Sections): ApiInterface$Section { const exposed: $Shape = {}; - const { methods } = interfaces[section]; + const methods = interfaces[section].public; return Object .keys(methods) @@ -22,10 +22,9 @@ module.exports = function createInterface (provider: ProviderInterface, section: const rpcName = `${section}_${name}`; const def = methods[name]; - // flowlint-next-line sketchy-null-bool:off exposed[name] = def.isSubscription - ? methodSubscribe(provider, rpcName, name, methods[name]) - : methodSend(provider, rpcName, name, methods[name]); + ? methodSubscribe(provider, rpcName, name, def) + : methodSend(provider, rpcName, name, def); return exposed; }, exposed); diff --git a/packages/api/src/create/interface.spec.js b/packages/api/src/create/interface.spec.js index 79d871fcc713..2e9ab4e03571 100644 --- a/packages/api/src/create/interface.spec.js +++ b/packages/api/src/create/interface.spec.js @@ -6,20 +6,20 @@ const isFunction = require('@polkadot/util/is/function'); jest.mock('@polkadot/jsonrpc', () => ({ test: { - methods: { + public: { blah: { - params: { - foo: { type: 'Address' } - }, + params: [ + { name: 'foo', type: 'Address' } + ], type: 'Address' }, bleh: { - params: {}, + params: [], type: 'Address' }, pubsub: { isSubscription: true, - params: {}, + params: [], type: 'Address' } } diff --git a/packages/api/src/create/methodSend.spec.js b/packages/api/src/create/methodSend.spec.js index 81f9b26d1165..5e6a8d2532d3 100644 --- a/packages/api/src/create/methodSend.spec.js +++ b/packages/api/src/create/methodSend.spec.js @@ -12,14 +12,14 @@ describe('methodCall', () => { methods = { blah: { name: 'blah', - params: { - foo: { type: 'Bytes' } - }, + params: [ + { name: 'foo', type: 'Bytes' } + ], type: 'Bytes' }, bleh: { name: 'bleh', - params: {}, + params: [], type: 'Bytes' } }; diff --git a/packages/api/src/create/params.js b/packages/api/src/create/params.js index d646bc72ff59..846a2496d25f 100644 --- a/packages/api/src/create/params.js +++ b/packages/api/src/create/params.js @@ -8,8 +8,7 @@ import type { Params } from '@polkadot/params/types'; const formatInputs = require('@polkadot/api-format/input'); const assert = require('@polkadot/util/assert'); -module.exports = function createParams (_params: Params, values: Array): Array { - const params = Object.keys(_params).map((key) => _params[key]); +module.exports = function createParams (params: Params, values: Array): Array { const required = params.filter(({ isOptional }) => !isOptional); const optionalText = params.length ? ` (${(params.length - required.length) || 'none'} optional)` @@ -17,5 +16,5 @@ module.exports = function createParams (_params: Params, values: Array): assert(values.length >= required.length && values.length <= params.length, `${params.length || 'no'} params expected${optionalText}, found ${values.length} instead`); - return formatInputs(_params, values); + return formatInputs(params, values); }; diff --git a/packages/api/src/create/params.spec.js b/packages/api/src/create/params.spec.js index 99a21c3a2810..e71e7d2dd667 100644 --- a/packages/api/src/create/params.spec.js +++ b/packages/api/src/create/params.spec.js @@ -10,15 +10,15 @@ describe('params', () => { beforeEach(() => { methods = { blah: { - params: { - foo: { type: 'Bytes' } - }, + params: [ + { name: 'foo', type: 'Bytes' } + ], type: 'Bytes' }, bleh: { - params: { - foo: { type: 'Bytes', isOptional: true } - }, + params: [ + { name: 'foo', type: 'Bytes', isOptional: true } + ], type: 'Bytes' } }; diff --git a/yarn.lock b/yarn.lock index 48f2fcde85cd..71c6ea1e6ab6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -700,102 +700,86 @@ mkdirp "^0.5.1" rimraf "^2.6.2" -"@polkadot/extrinsics-substrate@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/extrinsics-substrate/-/extrinsics-substrate-0.16.15.tgz#c8ad42f38b568629a3de9089413a8275ef06dc8d" +"@polkadot/extrinsics@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.17.2.tgz#74c09019268ff81ebc5023a5c6d3bd2fd08385ee" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/extrinsics" "^0.16.15" - -"@polkadot/extrinsics@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.16.15.tgz#103cd7beb4049fee07d86ac34f02e14360dc9b32" - dependencies: - "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/params" "^0.16.15" - "@polkadot/primitives" "^0.16.15" + "@polkadot/params" "^0.17.2" + "@polkadot/primitives" "^0.17.2" "@polkadot/util" "^0.22.2" -"@polkadot/jsonrpc@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.16.15.tgz#aaa9bdff6af8fb32b49740843e203490a5285f15" +"@polkadot/jsonrpc@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.17.2.tgz#8056b2fddb41d1f15c2f428fb3622aeffa6d4d42" dependencies: - "@polkadot/params" "^0.16.15" + "@polkadot/params" "^0.17.2" babel-runtime "^6.26.0" -"@polkadot/params@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.16.15.tgz#31d419b6bdb815cdb87cd1a3bd251a670a5e02c7" +"@polkadot/params@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.17.2.tgz#eeb7d1427c375398f110e34b1fcf7d649af6ab40" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/extrinsics" "^0.16.15" - "@polkadot/extrinsics-substrate" "^0.16.15" - "@polkadot/primitives" "^0.16.15" + "@polkadot/extrinsics" "^0.17.2" + "@polkadot/primitives" "^0.17.2" "@polkadot/util" "^0.22.2" -"@polkadot/primitives-builder@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.16.15.tgz#89e986a6e7167247beea8dc2dcc8278b7cfd4404" +"@polkadot/primitives-builder@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.17.2.tgz#a470e9dc2665a7177318517884afb396f718825b" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-codec" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-codec" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-crypto" "^0.22.2" "@polkadot/util-triehash" "^0.22.2" -"@polkadot/primitives-codec@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.16.15.tgz#ecbe4c9cfc77da49361920ded193c5c2ff2c7aa0" +"@polkadot/primitives-codec@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.17.2.tgz#310d113b75191787b8b7fa45fdc1fd5858e5e00a" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-builder" "^0.16.15" - "@polkadot/primitives-rlp" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-builder" "^0.17.2" + "@polkadot/primitives-rlp" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-keyring" "^0.22.2" -"@polkadot/primitives-json@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.16.15.tgz#decb1fa9a134dd92a792d16a970bc9c1e783b81b" +"@polkadot/primitives-json@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.17.2.tgz#4db3603bb668f4bfae59fdddc72780860c83cd86" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-builder" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-builder" "^0.17.2" "@polkadot/util" "^0.22.2" -"@polkadot/primitives-rlp@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-rlp/-/primitives-rlp-0.16.15.tgz#863b78da6273887631193730fab96e5d81c11b33" +"@polkadot/primitives-rlp@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-rlp/-/primitives-rlp-0.17.2.tgz#a142e55a5cb42277ba5f2d6bd7ee34ffd31ff55e" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-builder" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-builder" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-crypto" "^0.22.2" -"@polkadot/primitives@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.16.15.tgz#b7f63adc89eb744d956ec93344dd74886cf9139e" - dependencies: - "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/util" "^0.22.2" - -"@polkadot/storage-substrate@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/storage-substrate/-/storage-substrate-0.16.15.tgz#f0ab2dc9c85ebe9f72e223d15bb84ef3f42dc5ad" +"@polkadot/primitives@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.17.2.tgz#44bd4a56708550054ad41d6fda46d66c0e1f6bcb" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/storage" "^0.16.15" "@polkadot/util" "^0.22.2" -"@polkadot/storage@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.16.15.tgz#e1cb8cf618ab75eb6483a236a52da14a46e15781" +"@polkadot/storage@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.17.2.tgz#bbb779879faec6c3b6691aedd4af898bf54c3e55" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/params" "^0.16.15" - "@polkadot/primitives" "^0.16.15" + "@polkadot/params" "^0.17.2" + "@polkadot/primitives" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-keyring" "^0.22.2"