From efdf1983e6a1fa0d70b1c14bcd3fba46c919efae Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 24 Aug 2023 17:40:36 +0200 Subject: [PATCH] Move Decoder, Encoder out of adaptor --- packages/tendermint-rpc/src/comet38/adaptor/index.ts | 1 - packages/tendermint-rpc/src/comet38/adaptor/types.ts | 10 ---------- packages/tendermint-rpc/src/comet38/comet38client.ts | 9 ++++++++- .../tendermint-rpc/src/tendermint34/adaptor/index.ts | 1 - .../tendermint-rpc/src/tendermint34/adaptor/types.ts | 10 ---------- .../src/tendermint34/tendermint34client.ts | 9 ++++++++- .../tendermint-rpc/src/tendermint37/adaptor/index.ts | 1 - .../tendermint-rpc/src/tendermint37/adaptor/types.ts | 10 ---------- .../src/tendermint37/tendermint37client.ts | 9 ++++++++- 9 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 packages/tendermint-rpc/src/comet38/adaptor/types.ts delete mode 100644 packages/tendermint-rpc/src/tendermint34/adaptor/types.ts delete mode 100644 packages/tendermint-rpc/src/tendermint37/adaptor/types.ts diff --git a/packages/tendermint-rpc/src/comet38/adaptor/index.ts b/packages/tendermint-rpc/src/comet38/adaptor/index.ts index d592b38a..38e92480 100644 --- a/packages/tendermint-rpc/src/comet38/adaptor/index.ts +++ b/packages/tendermint-rpc/src/comet38/adaptor/index.ts @@ -1,3 +1,2 @@ export { Params } from "./requests"; export { Responses } from "./responses"; -export { Decoder, Encoder } from "./types"; diff --git a/packages/tendermint-rpc/src/comet38/adaptor/types.ts b/packages/tendermint-rpc/src/comet38/adaptor/types.ts deleted file mode 100644 index f9bf1d11..00000000 --- a/packages/tendermint-rpc/src/comet38/adaptor/types.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; - -import * as requests from "../requests"; -import * as responses from "../responses"; - -// Encoder is a generic that matches all methods of Params -export type Encoder = (req: T) => JsonRpcRequest; - -// Decoder is a generic that matches all methods of Responses -export type Decoder = (res: JsonRpcSuccessResponse) => T; diff --git a/packages/tendermint-rpc/src/comet38/comet38client.ts b/packages/tendermint-rpc/src/comet38/comet38client.ts index f8037aa2..2d20513f 100644 --- a/packages/tendermint-rpc/src/comet38/comet38client.ts +++ b/packages/tendermint-rpc/src/comet38/comet38client.ts @@ -1,3 +1,4 @@ +import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; import { Stream } from "xstream"; import { createJsonRpcRequest } from "../jsonrpc"; @@ -9,10 +10,16 @@ import { SubscriptionEvent, WebsocketClient, } from "../rpcclients"; -import { Decoder, Encoder, Params, Responses } from "./adaptor"; +import { Params, Responses } from "./adaptor"; import * as requests from "./requests"; import * as responses from "./responses"; +// Encoder is a generic that matches all methods of Params +type Encoder = (req: T) => JsonRpcRequest; + +// Decoder is a generic that matches all methods of Responses +type Decoder = (res: JsonRpcSuccessResponse) => T; + export class Comet38Client { /** * Creates a new Tendermint client for the given endpoint. diff --git a/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts index d592b38a..38e92480 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts @@ -1,3 +1,2 @@ export { Params } from "./requests"; export { Responses } from "./responses"; -export { Decoder, Encoder } from "./types"; diff --git a/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts deleted file mode 100644 index f9bf1d11..00000000 --- a/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; - -import * as requests from "../requests"; -import * as responses from "../responses"; - -// Encoder is a generic that matches all methods of Params -export type Encoder = (req: T) => JsonRpcRequest; - -// Decoder is a generic that matches all methods of Responses -export type Decoder = (res: JsonRpcSuccessResponse) => T; diff --git a/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts b/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts index 701960de..6704a6f0 100644 --- a/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts +++ b/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts @@ -1,3 +1,4 @@ +import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; import { Stream } from "xstream"; import { createJsonRpcRequest } from "../jsonrpc"; @@ -9,10 +10,16 @@ import { SubscriptionEvent, WebsocketClient, } from "../rpcclients"; -import { Decoder, Encoder, Params, Responses } from "./adaptor"; +import { Params, Responses } from "./adaptor"; import * as requests from "./requests"; import * as responses from "./responses"; +// Encoder is a generic that matches all methods of Params +type Encoder = (req: T) => JsonRpcRequest; + +// Decoder is a generic that matches all methods of Responses +type Decoder = (res: JsonRpcSuccessResponse) => T; + export class Tendermint34Client { /** * Creates a new Tendermint client for the given endpoint. diff --git a/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts b/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts index d592b38a..38e92480 100644 --- a/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts +++ b/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts @@ -1,3 +1,2 @@ export { Params } from "./requests"; export { Responses } from "./responses"; -export { Decoder, Encoder } from "./types"; diff --git a/packages/tendermint-rpc/src/tendermint37/adaptor/types.ts b/packages/tendermint-rpc/src/tendermint37/adaptor/types.ts deleted file mode 100644 index f9bf1d11..00000000 --- a/packages/tendermint-rpc/src/tendermint37/adaptor/types.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; - -import * as requests from "../requests"; -import * as responses from "../responses"; - -// Encoder is a generic that matches all methods of Params -export type Encoder = (req: T) => JsonRpcRequest; - -// Decoder is a generic that matches all methods of Responses -export type Decoder = (res: JsonRpcSuccessResponse) => T; diff --git a/packages/tendermint-rpc/src/tendermint37/tendermint37client.ts b/packages/tendermint-rpc/src/tendermint37/tendermint37client.ts index 9d89708e..3d559497 100644 --- a/packages/tendermint-rpc/src/tendermint37/tendermint37client.ts +++ b/packages/tendermint-rpc/src/tendermint37/tendermint37client.ts @@ -1,3 +1,4 @@ +import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; import { Stream } from "xstream"; import { createJsonRpcRequest } from "../jsonrpc"; @@ -9,10 +10,16 @@ import { SubscriptionEvent, WebsocketClient, } from "../rpcclients"; -import { Decoder, Encoder, Params, Responses } from "./adaptor"; +import { Params, Responses } from "./adaptor"; import * as requests from "./requests"; import * as responses from "./responses"; +// Encoder is a generic that matches all methods of Params +type Encoder = (req: T) => JsonRpcRequest; + +// Decoder is a generic that matches all methods of Responses +type Decoder = (res: JsonRpcSuccessResponse) => T; + export class Tendermint37Client { /** * Creates a new Tendermint client for the given endpoint.