From 0b0a8188f8333f6cbc1563c6e2bc0c71380a04fd Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 19 Oct 2018 11:31:58 +0200 Subject: [PATCH] Declutter types root (a bit), move *.rpc..json to json/ --- package.json | 2 +- packages/types/src/ExtrinsicStatus.spec.js | 2 +- packages/types/src/Header.only.json | 1 - packages/types/src/Header.spec.js | 4 ++-- packages/types/src/RuntimeVersion.spec.js | 2 +- packages/types/src/SignedBlock.spec.js | 4 ++-- .../ExtrinsicStatus.001.json} | 0 packages/types/src/json/Header.001.json | 1 + .../RuntimeVersion.001.json} | 0 .../src/{SignedBlock.rpc.json => json/SignedBlock.001.json} | 0 .../{SignedBlock.events.json => json/SignedBlock.002.json} | 0 yarn.lock | 6 +++--- 12 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 packages/types/src/Header.only.json rename packages/types/src/{ExtrinsicStatus.rpc.json => json/ExtrinsicStatus.001.json} (100%) create mode 100644 packages/types/src/json/Header.001.json rename packages/types/src/{RuntimeVersion.rpc.json => json/RuntimeVersion.001.json} (100%) rename packages/types/src/{SignedBlock.rpc.json => json/SignedBlock.001.json} (100%) rename packages/types/src/{SignedBlock.events.json => json/SignedBlock.002.json} (100%) diff --git a/package.json b/package.json index e883ef7b1e26..6941cf3972fd 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "test": "jest --coverage" }, "devDependencies": { - "@polkadot/dev": "^0.20.25", + "@polkadot/dev": "^0.20.26", "@polkadot/ts": "^0.1.30" }, "dependencies": { diff --git a/packages/types/src/ExtrinsicStatus.spec.js b/packages/types/src/ExtrinsicStatus.spec.js index 0d8f7b14cf9b..d00902a0c25d 100644 --- a/packages/types/src/ExtrinsicStatus.spec.js +++ b/packages/types/src/ExtrinsicStatus.spec.js @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the ISC license. See the LICENSE file for details. -import rpc from './ExtrinsicStatus.rpc.json'; +import rpc from './json/ExtrinsicStatus.001.json'; import ExtrinsicStatus from './ExtrinsicStatus'; describe('ExtrinsicStatus', () => { diff --git a/packages/types/src/Header.only.json b/packages/types/src/Header.only.json deleted file mode 100644 index 7a3909f0b547..000000000000 --- a/packages/types/src/Header.only.json +++ /dev/null @@ -1 +0,0 @@ -{"digest":{"logs":[]},"extrinsicsRoot":"0x45b0cfc220ceec5b7c1c62c4d4193d38e4eba48e8815729ce75f9c0ab0e4c1c0","number":0,"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","stateRoot":"0x294c3470ae3be7555240b9d034ec19c3715ba2c3f20b92441f8cea0cab66ab56"} diff --git a/packages/types/src/Header.spec.js b/packages/types/src/Header.spec.js index a5fe24ef5bce..2ce3db86c31a 100644 --- a/packages/types/src/Header.spec.js +++ b/packages/types/src/Header.spec.js @@ -3,11 +3,11 @@ // of the ISC license. See the LICENSE file for details. import Header from './Header'; -import json from './Header.only.json'; +import json from './json/Header.001.json'; describe('Header', () => { it('decodes an actual JSON response', () => { - const header = new Header(json); + const header = new Header(json.result); expect( header.blockNumber.toNumber() diff --git a/packages/types/src/RuntimeVersion.spec.js b/packages/types/src/RuntimeVersion.spec.js index 5b2da3462337..a31c2d7526d2 100644 --- a/packages/types/src/RuntimeVersion.spec.js +++ b/packages/types/src/RuntimeVersion.spec.js @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the ISC license. See the LICENSE file for details. -import rpc from './RuntimeVersion.rpc.json'; +import rpc from './json/RuntimeVersion.001.json'; import RuntimeVersion from './RuntimeVersion'; describe('RuntimeVersion', () => { diff --git a/packages/types/src/SignedBlock.spec.js b/packages/types/src/SignedBlock.spec.js index 060e36b75d8f..0ebf29b3ecd6 100644 --- a/packages/types/src/SignedBlock.spec.js +++ b/packages/types/src/SignedBlock.spec.js @@ -5,8 +5,8 @@ import extrinsics from '@polkadot/extrinsics/static'; import Method from './Method'; -import events from './SignedBlock.events.json'; -import rpc from './SignedBlock.rpc.json'; +import rpc from './json/SignedBlock.001.json'; +import events from './json/SignedBlock.002.json'; import SignedBlock from './SignedBlock'; describe('SignedBlock', () => { diff --git a/packages/types/src/ExtrinsicStatus.rpc.json b/packages/types/src/json/ExtrinsicStatus.001.json similarity index 100% rename from packages/types/src/ExtrinsicStatus.rpc.json rename to packages/types/src/json/ExtrinsicStatus.001.json diff --git a/packages/types/src/json/Header.001.json b/packages/types/src/json/Header.001.json new file mode 100644 index 000000000000..6512ddf2bffc --- /dev/null +++ b/packages/types/src/json/Header.001.json @@ -0,0 +1 @@ +{"jsonrpc":"2.0","result":{"digest":{"logs":[]},"extrinsicsRoot":"0x45b0cfc220ceec5b7c1c62c4d4193d38e4eba48e8815729ce75f9c0ab0e4c1c0","number":0,"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","stateRoot":"0x294c3470ae3be7555240b9d034ec19c3715ba2c3f20b92441f8cea0cab66ab56"},"id":1} diff --git a/packages/types/src/RuntimeVersion.rpc.json b/packages/types/src/json/RuntimeVersion.001.json similarity index 100% rename from packages/types/src/RuntimeVersion.rpc.json rename to packages/types/src/json/RuntimeVersion.001.json diff --git a/packages/types/src/SignedBlock.rpc.json b/packages/types/src/json/SignedBlock.001.json similarity index 100% rename from packages/types/src/SignedBlock.rpc.json rename to packages/types/src/json/SignedBlock.001.json diff --git a/packages/types/src/SignedBlock.events.json b/packages/types/src/json/SignedBlock.002.json similarity index 100% rename from packages/types/src/SignedBlock.events.json rename to packages/types/src/json/SignedBlock.002.json diff --git a/yarn.lock b/yarn.lock index 29ffb87c61f1..a6f69299cfc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1170,9 +1170,9 @@ version "1.1.0" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a" -"@polkadot/dev@^0.20.25": - version "0.20.25" - resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.20.25.tgz#864cacb25c6063c7209800b83a9731bc35d4c5ea" +"@polkadot/dev@^0.20.26": + version "0.20.26" + resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.20.26.tgz#875dadb8ed839c56eb2ec6e3447292ecc094916c" dependencies: "@babel/cli" "^7.0.0" "@babel/core" "^7.0.0"