Workaround for circular connect (#73)

* Workaround for circular connect

* Upgrade dependencies
This commit is contained in:
Jaco Greeff
2018-04-23 10:38:42 +02:00
committed by GitHub
parent e0c336abe5
commit e71b11a13b
5 changed files with 65 additions and 91 deletions
+2 -2
View File
@@ -33,8 +33,8 @@
"@polkadot/api-jsonrpc": "^0.8.16"
},
"dependencies": {
"@polkadot/primitives-json": "^0.10.1",
"@polkadot/util": "^0.19.1",
"@polkadot/primitives-json": "^0.10.2",
"@polkadot/util": "^0.19.2",
"babel-runtime": "^6.26.0"
}
}
+3 -3
View File
@@ -34,9 +34,9 @@
"nock": "^9.1.0"
},
"dependencies": {
"@polkadot/util": "^0.19.1",
"@polkadot/util-crypto": "^0.19.1",
"@polkadot/util-keyring": "^0.19.1",
"@polkadot/util": "^0.19.2",
"@polkadot/util-crypto": "^0.19.2",
"@polkadot/util-keyring": "^0.19.2",
"babel-runtime": "^6.26.0",
"isomorphic-fetch": "^2.2.1",
"websocket": "^1.0.25"
+4 -3
View File
@@ -5,8 +5,6 @@
import type { WsState } from './types';
const connect = require('./connect');
module.exports = function onClose (self: WsState): () => void {
return (): void => {
self.l.debug(() => ['disconnected from', self.endpoint]);
@@ -14,7 +12,10 @@ module.exports = function onClose (self: WsState): () => void {
self.isConnected = false;
if (self.autoConnect) {
setTimeout(() => connect(self), 1000);
setTimeout(() => {
// FIXME: This is a circular dependency
require('./connect')(self);
}, 1000);
}
};
};
+1 -1
View File
@@ -33,7 +33,7 @@
"@polkadot/api-format": "^0.8.16",
"@polkadot/api-jsonrpc": "^0.8.16",
"@polkadot/api-provider": "^0.8.16",
"@polkadot/util": "^0.19.1",
"@polkadot/util": "^0.19.2",
"babel-runtime": "^6.26.0"
}
}
+55 -82
View File
@@ -117,58 +117,58 @@
stylelint "^9.1.1"
stylelint-config-standard "^18.2.0"
"@polkadot/primitives-builder@^0.10.1":
version "0.10.1"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.10.1.tgz#1f930bb3629329bbb0a444c15ded864ef8e9db64"
"@polkadot/primitives-builder@^0.10.2":
version "0.10.2"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.10.2.tgz#457de7f3db7815f99486276deccea530d3638d13"
dependencies:
"@polkadot/primitives" "^0.10.1"
"@polkadot/primitives-codec" "^0.10.1"
"@polkadot/util" "^0.18.4"
"@polkadot/util-crypto" "^0.18.4"
"@polkadot/util-triehash" "^0.18.4"
"@polkadot/primitives" "^0.10.2"
"@polkadot/primitives-codec" "^0.10.2"
"@polkadot/util" "^0.19.2"
"@polkadot/util-crypto" "^0.19.2"
"@polkadot/util-triehash" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/primitives-codec@^0.10.1":
version "0.10.1"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.10.1.tgz#54f42cbd87bab7af00a63768f845e4f50dc26c2a"
"@polkadot/primitives-codec@^0.10.2":
version "0.10.2"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.10.2.tgz#ee2e5e641c0d90545eec1f2db01ad47caea6b038"
dependencies:
"@polkadot/primitives" "^0.10.1"
"@polkadot/primitives-builder" "^0.10.1"
"@polkadot/primitives-rlp" "^0.10.1"
"@polkadot/util" "^0.18.4"
"@polkadot/util-keyring" "^0.18.4"
"@polkadot/primitives" "^0.10.2"
"@polkadot/primitives-builder" "^0.10.2"
"@polkadot/primitives-rlp" "^0.10.2"
"@polkadot/util" "^0.19.2"
"@polkadot/util-keyring" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/primitives-json@^0.10.1":
version "0.10.1"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.10.1.tgz#39bfec3ed6ddd8aef82bc12b6e3001d3a288af94"
"@polkadot/primitives-json@^0.10.2":
version "0.10.2"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.10.2.tgz#d91ea6159b8121f5e41d86ed875e3b39a8d688ad"
dependencies:
"@polkadot/primitives" "^0.10.1"
"@polkadot/primitives-builder" "^0.10.1"
"@polkadot/util" "^0.18.4"
"@polkadot/primitives" "^0.10.2"
"@polkadot/primitives-builder" "^0.10.2"
"@polkadot/util" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/primitives-rlp@^0.10.1":
version "0.10.1"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-rlp/-/primitives-rlp-0.10.1.tgz#dd2fb7c9a990dc88132c88bc3128f5e749bbc7e3"
"@polkadot/primitives-rlp@^0.10.2":
version "0.10.2"
resolved "https://registry.yarnpkg.com/@polkadot/primitives-rlp/-/primitives-rlp-0.10.2.tgz#038559b34d3260aaacb9f76d5ea687b2a6ef5c7f"
dependencies:
"@polkadot/primitives" "^0.10.1"
"@polkadot/primitives-builder" "^0.10.1"
"@polkadot/primitives-json" "^0.10.1"
"@polkadot/util" "^0.18.4"
"@polkadot/util-crypto" "^0.18.4"
"@polkadot/primitives" "^0.10.2"
"@polkadot/primitives-builder" "^0.10.2"
"@polkadot/primitives-json" "^0.10.2"
"@polkadot/util" "^0.19.2"
"@polkadot/util-crypto" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/primitives@^0.10.1":
version "0.10.1"
resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.10.1.tgz#c670f132eaed0cc32bd79177b285f178f3d4fa3d"
"@polkadot/primitives@^0.10.2":
version "0.10.2"
resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.10.2.tgz#9dd36919b3a6bb7b98910d58dbfcda86deb06bb0"
dependencies:
"@polkadot/util" "^0.18.4"
"@polkadot/util" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/util-crypto@^0.18.4":
version "0.18.4"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.18.4.tgz#27e443ad46427cde49067a4b8525a99ffaf71df0"
"@polkadot/util-crypto@^0.19.2":
version "0.19.2"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.19.2.tgz#2250cc19c2050ee1661fb336417eb53ea84bc761"
dependencies:
babel-runtime "^6.26.0"
blakejs "^1.1.0"
@@ -176,60 +176,33 @@
tweetnacl "^1.0.0"
xxhashjs "^0.2.2"
"@polkadot/util-crypto@^0.19.1":
version "0.19.1"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.19.1.tgz#95927de2f8a4384f05b872132e00bfd34aa1ea77"
"@polkadot/util-keyring@^0.19.2":
version "0.19.2"
resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.19.2.tgz#ae61a246384d8f57ef585ec9a7e916eb49f36a67"
dependencies:
babel-runtime "^6.26.0"
blakejs "^1.1.0"
js-sha3 "^0.7.0"
tweetnacl "^1.0.0"
xxhashjs "^0.2.2"
"@polkadot/util-keyring@^0.18.4":
version "0.18.4"
resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.18.4.tgz#0e2bdbb3700275025632f42171a3fecacde513e3"
dependencies:
"@polkadot/util" "^0.18.4"
"@polkadot/util-crypto" "^0.18.4"
"@polkadot/util" "^0.19.2"
"@polkadot/util-crypto" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/util-keyring@^0.19.1":
version "0.19.1"
resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.19.1.tgz#dbf6e9efbe1dd4de982367c279b3193584db414f"
"@polkadot/util-rlp@^0.19.2":
version "0.19.2"
resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.19.2.tgz#cba435622030a6269e662d12a3d03358c2ec6f2d"
dependencies:
"@polkadot/util" "^0.19.1"
"@polkadot/util-crypto" "^0.19.1"
"@polkadot/util" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/util-rlp@^0.18.4":
version "0.18.4"
resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.18.4.tgz#0b18c2b710eb6bf06aae70245762738e71059ade"
"@polkadot/util-triehash@^0.19.2":
version "0.19.2"
resolved "https://registry.yarnpkg.com/@polkadot/util-triehash/-/util-triehash-0.19.2.tgz#012953a5c58e82830147a2e35d64366ac1129c70"
dependencies:
"@polkadot/util" "^0.18.4"
"@polkadot/util" "^0.19.2"
"@polkadot/util-crypto" "^0.19.2"
"@polkadot/util-rlp" "^0.19.2"
babel-runtime "^6.26.0"
"@polkadot/util-triehash@^0.18.4":
version "0.18.4"
resolved "https://registry.yarnpkg.com/@polkadot/util-triehash/-/util-triehash-0.18.4.tgz#bee1b9a7d59da962e470b52d18270c36fa2d46d0"
dependencies:
"@polkadot/util" "^0.18.4"
"@polkadot/util-crypto" "^0.18.4"
"@polkadot/util-rlp" "^0.18.4"
babel-runtime "^6.26.0"
"@polkadot/util@^0.18.4":
version "0.18.4"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.18.4.tgz#b1886a3d4663d302fe1234705f506fae95b371b8"
dependencies:
babel-runtime "^6.26.0"
bn.js "^4.11.8"
deasync "^0.1.12"
ip-regex "^2.1.0"
"@polkadot/util@^0.19.1":
version "0.19.1"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.19.1.tgz#e19dc51b3d998b489ed26738a3a1e0cded65c020"
"@polkadot/util@^0.19.2":
version "0.19.2"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.19.2.tgz#5517aaa0a39f01d83c6899e3f41301e0335e6434"
dependencies:
babel-runtime "^6.26.0"
bn.js "^4.11.8"