From bdd0cb9d9a3871a5fd06bda932560d5516082b02 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 10 Sep 2019 17:55:02 +0200 Subject: [PATCH] Remove ExtError from use (removed from util) --- packages/api-derive/package.json | 2 +- packages/api-metadata/package.json | 6 +++--- packages/api/package.json | 4 ++-- packages/rpc-core/package.json | 2 +- packages/rpc-core/src/index.ts | 6 +++--- packages/rpc-provider/package.json | 6 +++--- packages/types/package.json | 6 +++--- yarn.lock | 30 +++++++++++++++--------------- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index e6301db2b3..974cb6a176 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -32,6 +32,6 @@ "@polkadot/types": "^0.92.0-beta.0" }, "devDependencies": { - "@polkadot/keyring": "^1.2.1" + "@polkadot/keyring": "^1.3.0-beta.1" } } diff --git a/packages/api-metadata/package.json b/packages/api-metadata/package.json index 3487331fc1..4d1c0465a2 100644 --- a/packages/api-metadata/package.json +++ b/packages/api-metadata/package.json @@ -28,10 +28,10 @@ "dependencies": { "@babel/runtime": "^7.5.5", "@polkadot/types": "^0.92.0-beta.0", - "@polkadot/util": "^1.2.1", - "@polkadot/util-crypto": "^1.2.1" + "@polkadot/util": "^1.3.0-beta.1", + "@polkadot/util-crypto": "^1.3.0-beta.1" }, "devDependencies": { - "@polkadot/keyring": "^1.2.1" + "@polkadot/keyring": "^1.3.0-beta.1" } } diff --git a/packages/api/package.json b/packages/api/package.json index d71037f8b9..78c996f842 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -32,9 +32,9 @@ "@polkadot/rpc-core": "^0.92.0-beta.0", "@polkadot/rpc-provider": "^0.92.0-beta.0", "@polkadot/types": "^0.92.0-beta.0", - "@polkadot/util-crypto": "^1.2.1" + "@polkadot/util-crypto": "^1.3.0-beta.1" }, "devDependencies": { - "@polkadot/keyring": "^1.2.1" + "@polkadot/keyring": "^1.3.0-beta.1" } } diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 0876f9223d..79ccb45ac0 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -30,7 +30,7 @@ "@polkadot/jsonrpc": "^0.92.0-beta.0", "@polkadot/rpc-provider": "^0.92.0-beta.0", "@polkadot/types": "^0.92.0-beta.0", - "@polkadot/util": "^1.2.1", + "@polkadot/util": "^1.3.0-beta.1", "rxjs": "^6.5.3" } } diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts index 3c5532e707..9726bbd90e 100644 --- a/packages/rpc-core/src/index.ts +++ b/packages/rpc-core/src/index.ts @@ -15,7 +15,7 @@ import { catchError, map, publishReplay, refCount, switchMap } from 'rxjs/operat import interfaces from '@polkadot/jsonrpc'; import { ClassOf, Option, StorageData, StorageKey, Vec, createClass } from '@polkadot/types'; import { createTypeUnsafe } from '@polkadot/types/codec'; -import { ExtError, assert, isFunction, isNull, isNumber, logger } from '@polkadot/util'; +import { assert, isFunction, isNull, isNumber, logger } from '@polkadot/util'; const l = logger('rpc-core'); @@ -163,7 +163,7 @@ export default class Rpc implements RpcInterface { l.error(message); - return throwError(new ExtError(message, (error as ExtError).code, undefined)); + return throwError(new Error(message)); }), publishReplay(1), // create a Replay(1) refCount() // Unsubcribe WS when there are no more subscribers @@ -191,7 +191,7 @@ export default class Rpc implements RpcInterface { l.error(message); - observer.error(new ExtError(message, (error as ExtError).code, undefined)); + observer.error(new Error(message)); }; try { diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 19ae004e55..8db83a46f4 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -28,15 +28,15 @@ "dependencies": { "@babel/runtime": "^7.5.5", "@polkadot/api-metadata": "^0.92.0-beta.0", - "@polkadot/util": "^1.2.1", - "@polkadot/util-crypto": "^1.2.1", + "@polkadot/util": "^1.3.0-beta.1", + "@polkadot/util-crypto": "^1.3.0-beta.1", "@types/nock": "^10.0.3", "eventemitter3": "^4.0.0", "isomorphic-fetch": "^2.2.1", "websocket": "^1.0.29" }, "devDependencies": { - "@polkadot/keyring": "^1.2.1", + "@polkadot/keyring": "^1.3.0-beta.1", "mock-socket": "^9.0.0", "nock": "^11.3.1" } diff --git a/packages/types/package.json b/packages/types/package.json index 5eb2172709..a4b584e176 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -27,12 +27,12 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme", "dependencies": { "@babel/runtime": "^7.5.5", - "@polkadot/util": "^1.2.1", - "@polkadot/util-crypto": "^1.2.1", + "@polkadot/util": "^1.3.0-beta.1", + "@polkadot/util-crypto": "^1.3.0-beta.1", "@types/memoizee": "^0.4.2", "memoizee": "^0.4.14" }, "devDependencies": { - "@polkadot/keyring": "^1.2.1" + "@polkadot/keyring": "^1.3.0-beta.1" } } diff --git a/yarn.lock b/yarn.lock index 038f4add89..6d17263a3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1841,14 +1841,14 @@ typescript "^3.6.2" vuepress "^1.0.3" -"@polkadot/keyring@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.2.1.tgz#eead04a939784991dd52e9bd0d5b805ddc92e4fd" - integrity sha512-NDoOK5lNqC9TERuF47RqctZ1An4uScPR8S0dcZOZRG5z/q2DTq9Awt0AgOQflG8fwugrcwrsN2f+IFsS98gyBA== +"@polkadot/keyring@^1.3.0-beta.1": + version "1.3.0-beta.1" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.3.0-beta.1.tgz#c87baf530e1969eb2334855844f7eafeaba3507a" + integrity sha512-vCPFyixlJG46bRC7AyCjQCFLrAXQCYV7s45tqgN7j/wlfSiOn4gDChtorYspcWTT7RpTtKpw1DJTkFRX2PXbkw== dependencies: "@babel/runtime" "^7.5.5" - "@polkadot/util" "^1.2.1" - "@polkadot/util-crypto" "^1.2.1" + "@polkadot/util" "^1.3.0-beta.1" + "@polkadot/util-crypto" "^1.3.0-beta.1" "@polkadot/ts@^0.1.71": version "0.1.71" @@ -1857,13 +1857,13 @@ dependencies: "@types/chrome" "^0.0.88" -"@polkadot/util-crypto@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.2.1.tgz#ec1ad6e7c69904846c4279f781eba3044abd671e" - integrity sha512-IO3Ua9v+VMEczincDHrgxt2MIHvB4CyfBZwBYRZuchwQ6hDV613j34BQzKwszRfUn7h0WEc562a4a4mj9gRRdA== +"@polkadot/util-crypto@^1.3.0-beta.1": + version "1.3.0-beta.1" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.3.0-beta.1.tgz#b1227861a313056350957040d23075fdb07dd288" + integrity sha512-19iS0JqtIUMJODgD46Rksn0DBcOjtps0lsVVwbBM68KA7z6KVYFxLvc83qJtoskDdvOH0wszlodS9nHEDQH2sg== dependencies: "@babel/runtime" "^7.5.5" - "@polkadot/util" "^1.2.1" + "@polkadot/util" "^1.3.0-beta.1" "@polkadot/wasm-crypto" "^0.14.1" "@types/bip39" "^2.4.2" "@types/bs58" "^4.0.0" @@ -1879,10 +1879,10 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.2.1.tgz#a6de04aa04a30b51e3ac8e1dbf53d3c45f8e6189" - integrity sha512-N8mnCEbLFd0RH/ro3D+A4kSWCtHDjJJ/WgUvHYw7Ez1pX8Gdl2s5OJt0LuljRVa0iB/56kXD8wBpzU2eOU6RrA== +"@polkadot/util@^1.3.0-beta.1": + version "1.3.0-beta.1" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.3.0-beta.1.tgz#18090d5bbae7022d8d07c6d4a915575668fedc95" + integrity sha512-9joC50+neAtVKiBCCdtPMJN+DrmNUgRsRzmZAbrbRFzMYuZfaqxQN/93Ef9NzH2T9TE2KXyU81QPQpBKo2Oz2A== dependencies: "@babel/runtime" "^7.5.5" "@types/bn.js" "^4.11.5"