From 4adfcb0f6af524b1cffab98608d8a83c69eef1bf Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 24 Aug 2023 16:32:57 +0200 Subject: [PATCH] Remove hashTx/hashBlock from Adaptor abstraction --- packages/tendermint-rpc/src/comet38/adaptor/index.ts | 3 --- packages/tendermint-rpc/src/comet38/adaptor/types.ts | 2 -- packages/tendermint-rpc/src/comet38/comet38client.spec.ts | 4 ++-- packages/tendermint-rpc/src/tendermint34/adaptor/index.ts | 3 --- packages/tendermint-rpc/src/tendermint34/adaptor/types.ts | 2 -- .../src/tendermint34/tendermint34client.spec.ts | 4 ++-- packages/tendermint-rpc/src/tendermint37/adaptor/index.ts | 3 --- packages/tendermint-rpc/src/tendermint37/adaptor/types.ts | 2 -- .../src/tendermint37/tendermint37client.spec.ts | 4 ++-- 9 files changed, 6 insertions(+), 21 deletions(-) diff --git a/packages/tendermint-rpc/src/comet38/adaptor/index.ts b/packages/tendermint-rpc/src/comet38/adaptor/index.ts index ef16c695..f6e29984 100644 --- a/packages/tendermint-rpc/src/comet38/adaptor/index.ts +++ b/packages/tendermint-rpc/src/comet38/adaptor/index.ts @@ -1,4 +1,3 @@ -import { hashBlock, hashTx } from "../hasher"; import { Params } from "./requests"; import { Responses } from "./responses"; import { Adaptor } from "./types"; @@ -8,6 +7,4 @@ export { Decoder, Encoder, Params, Responses } from "./types"; export const adaptor38: Adaptor = { params: Params, responses: Responses, - hashTx: hashTx, - hashBlock: hashBlock, }; diff --git a/packages/tendermint-rpc/src/comet38/adaptor/types.ts b/packages/tendermint-rpc/src/comet38/adaptor/types.ts index 1558df6d..1ce9ea1c 100644 --- a/packages/tendermint-rpc/src/comet38/adaptor/types.ts +++ b/packages/tendermint-rpc/src/comet38/adaptor/types.ts @@ -7,8 +7,6 @@ import * as responses from "../responses"; export interface Adaptor { readonly params: Params; readonly responses: Responses; - readonly hashTx: (tx: Uint8Array) => Uint8Array; - readonly hashBlock: (header: responses.Header) => Uint8Array; } // Encoder is a generic that matches all methods of Params diff --git a/packages/tendermint-rpc/src/comet38/comet38client.spec.ts b/packages/tendermint-rpc/src/comet38/comet38client.spec.ts index 3c83e130..c949036a 100644 --- a/packages/tendermint-rpc/src/comet38/comet38client.spec.ts +++ b/packages/tendermint-rpc/src/comet38/comet38client.spec.ts @@ -16,8 +16,8 @@ import { tendermintInstances, tendermintSearchIndexUpdated, } from "../testutil.spec"; -import { adaptor38 } from "./adaptor"; import { Comet38Client } from "./comet38client"; +import { hashTx } from "./hasher"; import { buildQuery } from "./requests"; import * as responses from "./responses"; @@ -100,7 +100,7 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues) pendingWithoutTendermint(); const client = await Comet38Client.create(rpcFactory()); const tx = buildKvTx(randomString(), randomString()); - const calculatedTxHash = adaptor38.hashTx(tx); + const calculatedTxHash = hashTx(tx); const response = await client.broadcastTxCommit({ tx: tx }); expect(response.hash).toEqual(calculatedTxHash); diff --git a/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts index 4ef0b8cd..5e63cb3d 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/index.ts @@ -1,4 +1,3 @@ -import { hashBlock, hashTx } from "../hasher"; import { Params } from "./requests"; import { Responses } from "./responses"; import { Adaptor } from "./types"; @@ -8,6 +7,4 @@ export { Decoder, Encoder, Params, Responses } from "./types"; export const adaptor34: Adaptor = { params: Params, responses: Responses, - hashTx: hashTx, - hashBlock: hashBlock, }; diff --git a/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts b/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts index 1558df6d..1ce9ea1c 100644 --- a/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts +++ b/packages/tendermint-rpc/src/tendermint34/adaptor/types.ts @@ -7,8 +7,6 @@ import * as responses from "../responses"; export interface Adaptor { readonly params: Params; readonly responses: Responses; - readonly hashTx: (tx: Uint8Array) => Uint8Array; - readonly hashBlock: (header: responses.Header) => Uint8Array; } // Encoder is a generic that matches all methods of Params diff --git a/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts b/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts index a3d64e5e..eca45de8 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 "./adaptor"; +import { hashTx } from "./hasher"; import { buildQuery } from "./requests"; import * as responses from "./responses"; import { Tendermint34Client } from "./tendermint34client"; @@ -100,7 +100,7 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues) pendingWithoutTendermint(); const client = await Tendermint34Client.create(rpcFactory()); const tx = buildKvTx(randomString(), randomString()); - const calculatedTxHash = adaptor34.hashTx(tx); + const calculatedTxHash = hashTx(tx); const response = await client.broadcastTxCommit({ tx: tx }); expect(response.hash).toEqual(calculatedTxHash); diff --git a/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts b/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts index 0fa5031a..86739c66 100644 --- a/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts +++ b/packages/tendermint-rpc/src/tendermint37/adaptor/index.ts @@ -1,4 +1,3 @@ -import { hashBlock, hashTx } from "../hasher"; import { Params } from "./requests"; import { Responses } from "./responses"; import { Adaptor } from "./types"; @@ -8,6 +7,4 @@ export { Decoder, Encoder, Params, Responses } from "./types"; export const adaptor37: Adaptor = { params: Params, responses: Responses, - hashTx: hashTx, - hashBlock: hashBlock, }; diff --git a/packages/tendermint-rpc/src/tendermint37/adaptor/types.ts b/packages/tendermint-rpc/src/tendermint37/adaptor/types.ts index 1558df6d..1ce9ea1c 100644 --- a/packages/tendermint-rpc/src/tendermint37/adaptor/types.ts +++ b/packages/tendermint-rpc/src/tendermint37/adaptor/types.ts @@ -7,8 +7,6 @@ import * as responses from "../responses"; export interface Adaptor { readonly params: Params; readonly responses: Responses; - readonly hashTx: (tx: Uint8Array) => Uint8Array; - readonly hashBlock: (header: responses.Header) => Uint8Array; } // Encoder is a generic that matches all methods of Params diff --git a/packages/tendermint-rpc/src/tendermint37/tendermint37client.spec.ts b/packages/tendermint-rpc/src/tendermint37/tendermint37client.spec.ts index 9389ffa9..36732b31 100644 --- a/packages/tendermint-rpc/src/tendermint37/tendermint37client.spec.ts +++ b/packages/tendermint-rpc/src/tendermint37/tendermint37client.spec.ts @@ -16,7 +16,7 @@ import { tendermintInstances, tendermintSearchIndexUpdated, } from "../testutil.spec"; -import { adaptor37 } from "./adaptor"; +import { hashTx } from "./hasher"; import { buildQuery } from "./requests"; import * as responses from "./responses"; import { Tendermint37Client } from "./tendermint37client"; @@ -100,7 +100,7 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues) pendingWithoutTendermint(); const client = await Tendermint37Client.create(rpcFactory()); const tx = buildKvTx(randomString(), randomString()); - const calculatedTxHash = adaptor37.hashTx(tx); + const calculatedTxHash = hashTx(tx); const response = await client.broadcastTxCommit({ tx: tx }); expect(response.hash).toEqual(calculatedTxHash);