From 351e5e65639665bd2a254a5d965af71c2e65ae55 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Tue, 8 Jun 2021 16:49:55 +0200 Subject: [PATCH] tendermint-rpc: Rearrange adaptor code --- .../{adaptors/v0-33 => adaptor}/index.ts | 8 +++++--- .../{adaptors/v0-33 => adaptor}/requests.ts | 6 +++--- .../{adaptors/v0-33 => adaptor}/responses.ts | 12 ++++++------ .../tendermint33/{adaptor.ts => adaptor/types.ts} | 6 +++--- .../src/tendermint33/adaptors/index.ts | 2 -- .../src/tendermint33/tendermint33client.spec.ts | 2 +- .../src/tendermint33/tendermint33client.ts | 3 +-- .../{adaptors/v0-34 => adaptor}/index.ts | 8 +++++--- .../{adaptors/v0-34 => adaptor}/requests.ts | 6 +++--- .../{adaptors/v0-34 => adaptor}/responses.ts | 12 ++++++------ .../tendermint34/{adaptor.ts => adaptor/types.ts} | 6 +++--- .../src/tendermint34/adaptors/index.ts | 2 -- .../src/tendermint34/tendermint34client.spec.ts | 2 +- .../src/tendermint34/tendermint34client.ts | 3 +-- 14 files changed, 38 insertions(+), 40 deletions(-) rename packages/tendermint-rpc/src/tendermint33/{adaptors/v0-33 => adaptor}/index.ts (55%) rename packages/tendermint-rpc/src/tendermint33/{adaptors/v0-33 => adaptor}/requests.ts (96%) rename packages/tendermint-rpc/src/tendermint33/{adaptors/v0-33 => adaptor}/responses.ts (99%) rename packages/tendermint-rpc/src/tendermint33/{adaptor.ts => adaptor/types.ts} (96%) delete mode 100644 packages/tendermint-rpc/src/tendermint33/adaptors/index.ts rename packages/tendermint-rpc/src/tendermint34/{adaptors/v0-34 => adaptor}/index.ts (55%) rename packages/tendermint-rpc/src/tendermint34/{adaptors/v0-34 => adaptor}/requests.ts (97%) rename packages/tendermint-rpc/src/tendermint34/{adaptors/v0-34 => adaptor}/responses.ts (99%) rename packages/tendermint-rpc/src/tendermint34/{adaptor.ts => adaptor/types.ts} (96%) delete mode 100644 packages/tendermint-rpc/src/tendermint34/adaptors/index.ts diff --git a/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/index.ts b/packages/tendermint-rpc/src/tendermint33/adaptor/index.ts similarity index 55% rename from packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/index.ts rename to packages/tendermint-rpc/src/tendermint33/adaptor/index.ts index e80318a3..85d222a6 100644 --- a/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/index.ts +++ b/packages/tendermint-rpc/src/tendermint33/adaptor/index.ts @@ -1,10 +1,12 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Adaptor } from "../../adaptor"; -import { hashBlock, hashTx } from "../../hasher"; +import { hashBlock, hashTx } from "../hasher"; import { Params } from "./requests"; import { Responses } from "./responses"; +import { Adaptor } from "./types"; -export const v0_33: Adaptor = { +export { Decoder, Encoder, Params, Responses } from "./types"; + +export const adaptor33: Adaptor = { params: Params, responses: Responses, hashTx: hashTx, diff --git a/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/requests.ts b/packages/tendermint-rpc/src/tendermint33/adaptor/requests.ts similarity index 96% rename from packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/requests.ts rename to packages/tendermint-rpc/src/tendermint33/adaptor/requests.ts index 54436f7a..512ed0cb 100644 --- a/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/requests.ts +++ b/packages/tendermint-rpc/src/tendermint33/adaptor/requests.ts @@ -2,9 +2,9 @@ import { toBase64, toHex } from "@cosmjs/encoding"; import { JsonRpcRequest } from "@cosmjs/json-rpc"; -import { createJsonRpcRequest } from "../../../jsonrpc"; -import { assertNotEmpty, Integer, may } from "../../encodings"; -import * as requests from "../../requests"; +import { createJsonRpcRequest } from "../../jsonrpc"; +import { assertNotEmpty, Integer, may } from "../encodings"; +import * as requests from "../requests"; interface HeightParam { readonly height?: number; diff --git a/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/responses.ts b/packages/tendermint-rpc/src/tendermint33/adaptor/responses.ts similarity index 99% rename from packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/responses.ts rename to packages/tendermint-rpc/src/tendermint33/adaptor/responses.ts index 381904e4..b7e78c22 100644 --- a/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/responses.ts +++ b/packages/tendermint-rpc/src/tendermint33/adaptor/responses.ts @@ -3,9 +3,9 @@ import { fromBase64, fromHex } from "@cosmjs/encoding"; import { JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; import { assert } from "@cosmjs/utils"; -import { fromRfc3339WithNanoseconds } from "../../../dates"; -import { SubscriptionEvent } from "../../../rpcclients"; -import { BlockIdFlag, CommitSignature, ValidatorPubkey } from "../../../types"; +import { fromRfc3339WithNanoseconds } from "../../dates"; +import { SubscriptionEvent } from "../../rpcclients"; +import { BlockIdFlag, CommitSignature, ValidatorPubkey } from "../../types"; import { assertArray, assertBoolean, @@ -18,9 +18,9 @@ import { Integer, may, optional, -} from "../../encodings"; -import { hashTx } from "../../hasher"; -import * as responses from "../../responses"; +} from "../encodings"; +import { hashTx } from "../hasher"; +import * as responses from "../responses"; interface AbciInfoResult { readonly response: RpcAbciInfoResponse; diff --git a/packages/tendermint-rpc/src/tendermint33/adaptor.ts b/packages/tendermint-rpc/src/tendermint33/adaptor/types.ts similarity index 96% rename from packages/tendermint-rpc/src/tendermint33/adaptor.ts rename to packages/tendermint-rpc/src/tendermint33/adaptor/types.ts index 7248942d..9ecd4ab4 100644 --- a/packages/tendermint-rpc/src/tendermint33/adaptor.ts +++ b/packages/tendermint-rpc/src/tendermint33/adaptor/types.ts @@ -1,8 +1,8 @@ import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; -import { SubscriptionEvent } from "../rpcclients"; -import * as requests from "./requests"; -import * as responses from "./responses"; +import { SubscriptionEvent } from "../../rpcclients"; +import * as requests from "../requests"; +import * as responses from "../responses"; export interface Adaptor { readonly params: Params; diff --git a/packages/tendermint-rpc/src/tendermint33/adaptors/index.ts b/packages/tendermint-rpc/src/tendermint33/adaptors/index.ts deleted file mode 100644 index 00efaf3e..00000000 --- a/packages/tendermint-rpc/src/tendermint33/adaptors/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -export { v0_33 as adaptor33 } from "./v0-33"; diff --git a/packages/tendermint-rpc/src/tendermint33/tendermint33client.spec.ts b/packages/tendermint-rpc/src/tendermint33/tendermint33client.spec.ts index dde83597..fe3c4c2f 100644 --- a/packages/tendermint-rpc/src/tendermint33/tendermint33client.spec.ts +++ b/packages/tendermint-rpc/src/tendermint33/tendermint33client.spec.ts @@ -16,7 +16,7 @@ import { tendermintInstances, tendermintSearchIndexUpdated, } from "../testutil.spec"; -import { adaptor33 } from "./adaptors"; +import { adaptor33 } from "./adaptor"; import { Tendermint33Client } from "./tendermint33client"; import { buildQuery } from "./requests"; import * as responses from "./responses"; diff --git a/packages/tendermint-rpc/src/tendermint33/tendermint33client.ts b/packages/tendermint-rpc/src/tendermint33/tendermint33client.ts index 321ee920..1b32911f 100644 --- a/packages/tendermint-rpc/src/tendermint33/tendermint33client.ts +++ b/packages/tendermint-rpc/src/tendermint33/tendermint33client.ts @@ -9,8 +9,7 @@ import { SubscriptionEvent, WebsocketClient, } from "../rpcclients"; -import { Decoder, Encoder, Params, Responses } from "./adaptor"; -import { adaptor33 } from "./adaptors"; +import { adaptor33, Decoder, Encoder, Params, Responses } from "./adaptor"; import * as requests from "./requests"; import * as responses from "./responses"; diff --git a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/index.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts similarity index 55% rename from packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/index.ts rename to packages/tendermint-rpc/src/tendermint34/adaptor/index.ts index a8d43a92..61a5d835 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/index.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts @@ -1,10 +1,12 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Adaptor } from "../../adaptor"; -import { hashBlock, hashTx } from "../../hasher"; +import { hashBlock, hashTx } from "../hasher"; import { Params } from "./requests"; import { Responses } from "./responses"; +import { Adaptor } from "./types"; -export const v0_34: Adaptor = { +export { Decoder, Encoder, Params, Responses } from "./types"; + +export const adaptor34: Adaptor = { params: Params, responses: Responses, hashTx: hashTx, diff --git a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/requests.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/requests.ts similarity index 97% rename from packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/requests.ts rename to packages/tendermint-rpc/src/tendermint34/adaptor/requests.ts index 1dc11c4c..c835bea1 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/requests.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/requests.ts @@ -2,9 +2,9 @@ import { toBase64, toHex } from "@cosmjs/encoding"; import { JsonRpcRequest } from "@cosmjs/json-rpc"; -import { createJsonRpcRequest } from "../../../jsonrpc"; -import { assertNotEmpty, Integer, may } from "../../encodings"; -import * as requests from "../../requests"; +import { createJsonRpcRequest } from "../../jsonrpc"; +import { assertNotEmpty, Integer, may } from "../encodings"; +import * as requests from "../requests"; interface HeightParam { readonly height?: number; diff --git a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts similarity index 99% rename from packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts rename to packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts index 90be82da..6943e44e 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptors/v0-34/responses.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/responses.ts @@ -3,9 +3,9 @@ import { fromBase64, fromHex } from "@cosmjs/encoding"; import { JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; import { assert } from "@cosmjs/utils"; -import { DateWithNanoseconds, fromRfc3339WithNanoseconds } from "../../../dates"; -import { SubscriptionEvent } from "../../../rpcclients"; -import { BlockIdFlag, CommitSignature, ValidatorPubkey } from "../../../types"; +import { DateWithNanoseconds, fromRfc3339WithNanoseconds } from "../../dates"; +import { SubscriptionEvent } from "../../rpcclients"; +import { BlockIdFlag, CommitSignature, ValidatorPubkey } from "../../types"; import { assertArray, assertBoolean, @@ -18,9 +18,9 @@ import { Integer, may, optional, -} from "../../encodings"; -import { hashTx } from "../../hasher"; -import * as responses from "../../responses"; +} from "../encodings"; +import { hashTx } from "../hasher"; +import * as responses from "../responses"; interface AbciInfoResult { readonly response: RpcAbciInfoResponse; diff --git a/packages/tendermint-rpc/src/tendermint34/adaptor.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts similarity index 96% rename from packages/tendermint-rpc/src/tendermint34/adaptor.ts rename to packages/tendermint-rpc/src/tendermint34/adaptor/types.ts index 44c06917..a57ec8d3 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptor.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts @@ -1,8 +1,8 @@ import { JsonRpcRequest, JsonRpcSuccessResponse } from "@cosmjs/json-rpc"; -import { SubscriptionEvent } from "../rpcclients"; -import * as requests from "./requests"; -import * as responses from "./responses"; +import { SubscriptionEvent } from "../../rpcclients"; +import * as requests from "../requests"; +import * as responses from "../responses"; export interface Adaptor { readonly params: Params; diff --git a/packages/tendermint-rpc/src/tendermint34/adaptors/index.ts b/packages/tendermint-rpc/src/tendermint34/adaptors/index.ts deleted file mode 100644 index 74c16d9b..00000000 --- a/packages/tendermint-rpc/src/tendermint34/adaptors/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -export { v0_34 as adaptor34 } from "./v0-34"; diff --git a/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts b/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts index 006b33a3..823dabe1 100644 --- a/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts +++ b/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts @@ -16,7 +16,7 @@ import { tendermintInstances, tendermintSearchIndexUpdated, } from "../testutil.spec"; -import { adaptor34 } from "./adaptors"; +import { adaptor34 } from "./adaptor"; import { buildQuery } from "./requests"; import * as responses from "./responses"; import { Tendermint34Client } from "./tendermint34client"; diff --git a/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts b/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts index bdf3f489..4650b7a9 100644 --- a/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts +++ b/packages/tendermint-rpc/src/tendermint34/tendermint34client.ts @@ -9,8 +9,7 @@ import { SubscriptionEvent, WebsocketClient, } from "../rpcclients"; -import { Decoder, Encoder, Params, Responses } from "./adaptor"; -import { adaptor34 } from "./adaptors"; +import { adaptor34, Decoder, Encoder, Params, Responses } from "./adaptor"; import * as requests from "./requests"; import * as responses from "./responses";