diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts index 9e428612ba..02d3d45f70 100644 --- a/packages/rpc-core/src/index.ts +++ b/packages/rpc-core/src/index.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ProviderInterface } from '@polkadot/rpc-provider/types'; +import { ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types'; import { RpcMethod, RpcSection, RpcParam } from '@polkadot/jsonrpc/types'; import { AnyJson, Codec, Registry } from '@polkadot/types/types'; import { RpcInterface, RpcInterfaceMethod, UserRpc } from './types'; @@ -214,7 +214,7 @@ export default class Rpc implements RpcInterface { } // create a subscriptor, it subscribes once and resolves with the id as subscribe - private createSubscriber ({ subType, subName, paramsJson, update }: { subType: string; subName: string; paramsJson: AnyJson[]; update: (error?: Error, result?: any) => void }, errorHandler: (error: Error) => void): Promise { + private createSubscriber ({ subType, subName, paramsJson, update }: { subType: string; subName: string; paramsJson: AnyJson[]; update: ProviderInterfaceCallback }, errorHandler: (error: Error) => void): Promise { return new Promise((resolve, reject): void => { this.provider .subscribe(subType, subName, paramsJson, update) @@ -247,7 +247,7 @@ export default class Rpc implements RpcInterface { try { const params = this.formatInputs(method, values); const paramsJson = params.map((param): AnyJson => param.toJSON()); - const update = (error?: Error, result?: any): void => { + const update = (error?: Error | null, result?: any): void => { if (error) { l.error(createErrorMessage(method, error)); return; diff --git a/packages/rpc-provider/src/types.ts b/packages/rpc-provider/src/types.ts index aa9dcb499e..ed0c6c7931 100644 --- a/packages/rpc-provider/src/types.ts +++ b/packages/rpc-provider/src/types.ts @@ -36,7 +36,7 @@ export type JsonRpcResponseBase = JsonRpcResponseSingle & JsonRpcResponseSubscri export type JsonRpcResponse = JsonRpcObject & JsonRpcResponseBase; -export type ProviderInterfaceCallback = (result: any) => void; +export type ProviderInterfaceCallback = (error: Error | null, result: any) => void; export type ProviderInterfaceEmitted = 'connected' | 'disconnected' | 'error'; diff --git a/packages/rpc-provider/src/ws/Provider.ts b/packages/rpc-provider/src/ws/Provider.ts index 5a34597013..0d62e03739 100644 --- a/packages/rpc-provider/src/ws/Provider.ts +++ b/packages/rpc-provider/src/ws/Provider.ts @@ -12,15 +12,13 @@ import Coder from '../coder'; import defaults from '../defaults'; import getWSClass from './getWSClass'; -type CallbackHandler = (error?: null | Error, value?: any) => void; - interface SubscriptionHandler { - callback: CallbackHandler; + callback: ProviderInterfaceCallback; type: string; } interface WsStateAwaiting { - callback: CallbackHandler; + callback: ProviderInterfaceCallback; method: string; params: any[]; subscription?: SubscriptionHandler;