From 317985c28d2a406b1bb3cd3ddec87251dda2b582 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 24 Apr 2018 10:42:54 +0200 Subject: [PATCH 1/2] Expose isConnected on api --- packages/api/src/index.js | 1 + packages/api/src/types.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/api/src/index.js b/packages/api/src/index.js index d9725c2819a5..156127adc80c 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -17,6 +17,7 @@ module.exports = function api (provider: ProviderInterface): ApiInterface { assert(provider && isFunction(provider.send), 'Expected Provider to API create'); const exposed: ApiInterface = { + isConnected: provider.isConnected, on: provider.on }; diff --git a/packages/api/src/types.js b/packages/api/src/types.js index 1a607f6a554c..4818acfe6406 100644 --- a/packages/api/src/types.js +++ b/packages/api/src/types.js @@ -16,6 +16,7 @@ export type ApiInterface$Section = { }; export type ApiInterface = { - [InterfaceTypes]: ApiInterface$Section, - on (type: ProviderInterface$Emitted, callback: ProviderInterface$EmitCb): void + isConnected: () => boolean, + on: (type: ProviderInterface$Emitted, callback: ProviderInterface$EmitCb) => void, + [InterfaceTypes]: ApiInterface$Section } From c7190274ecdc6c88314df985d9d0732bad26592e Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 24 Apr 2018 10:47:38 +0200 Subject: [PATCH 2/2] Revert isConnected & .on exposure --- packages/api/src/index.js | 5 +---- packages/api/src/types.js | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/api/src/index.js b/packages/api/src/index.js index 156127adc80c..50ea492be2b8 100644 --- a/packages/api/src/index.js +++ b/packages/api/src/index.js @@ -16,10 +16,7 @@ const createInterface = require('./create/interface'); module.exports = function api (provider: ProviderInterface): ApiInterface { assert(provider && isFunction(provider.send), 'Expected Provider to API create'); - const exposed: ApiInterface = { - isConnected: provider.isConnected, - on: provider.on - }; + const exposed: ApiInterface = {}; return Object .keys(interfaces) diff --git a/packages/api/src/types.js b/packages/api/src/types.js index 4818acfe6406..f7bf5995b167 100644 --- a/packages/api/src/types.js +++ b/packages/api/src/types.js @@ -4,7 +4,6 @@ // @flow import type { InterfaceTypes } from '@polkadot/api-jsonrpc/types'; -import type { ProviderInterface$Emitted, ProviderInterface$EmitCb } from '@polkadot/api-provider/types'; export type ApiInterface$Section$Method = { (...params: Array): Promise; @@ -16,7 +15,5 @@ export type ApiInterface$Section = { }; export type ApiInterface = { - isConnected: () => boolean, - on: (type: ProviderInterface$Emitted, callback: ProviderInterface$EmitCb) => void, [InterfaceTypes]: ApiInterface$Section }