diff --git a/packages/tendermint-rpc/src/adaptors/v0-33/index.ts b/packages/tendermint-rpc/src/adaptors/v0-33/index.ts index fb1e8a76..e80318a3 100644 --- a/packages/tendermint-rpc/src/adaptors/v0-33/index.ts +++ b/packages/tendermint-rpc/src/adaptors/v0-33/index.ts @@ -1,6 +1,6 @@ /* 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"; diff --git a/packages/tendermint-rpc/src/adaptors/v0-33/responses.ts b/packages/tendermint-rpc/src/adaptors/v0-33/responses.ts index b2d6a297..9893ab0d 100644 --- a/packages/tendermint-rpc/src/adaptors/v0-33/responses.ts +++ b/packages/tendermint-rpc/src/adaptors/v0-33/responses.ts @@ -17,10 +17,10 @@ import { may, optional, } from "../../encodings"; +import { hashTx } from "../../hasher"; import * as responses from "../../responses"; import { SubscriptionEvent } from "../../rpcclients"; import { BlockIdFlag, CommitSignature, ValidatorPubkey } from "../../types"; -import { hashTx } from "./hasher"; interface AbciInfoResult { readonly response: RpcAbciInfoResponse; diff --git a/packages/tendermint-rpc/src/adaptors/v0-33/hasher.spec.ts b/packages/tendermint-rpc/src/hasher.spec.ts similarity index 98% rename from packages/tendermint-rpc/src/adaptors/v0-33/hasher.spec.ts rename to packages/tendermint-rpc/src/hasher.spec.ts index a9f0c4c5..43b02203 100644 --- a/packages/tendermint-rpc/src/adaptors/v0-33/hasher.spec.ts +++ b/packages/tendermint-rpc/src/hasher.spec.ts @@ -1,7 +1,7 @@ import { fromBase64, fromHex } from "@cosmjs/encoding"; import { ReadonlyDate } from "readonly-date"; -import { ReadonlyDateWithNanoseconds } from "../../dates"; +import { ReadonlyDateWithNanoseconds } from "./dates"; import { hashBlock, hashTx } from "./hasher"; describe("Hasher", () => { diff --git a/packages/tendermint-rpc/src/adaptors/v0-33/hasher.ts b/packages/tendermint-rpc/src/hasher.ts similarity index 92% rename from packages/tendermint-rpc/src/adaptors/v0-33/hasher.ts rename to packages/tendermint-rpc/src/hasher.ts index 00525d2e..75d9f484 100644 --- a/packages/tendermint-rpc/src/adaptors/v0-33/hasher.ts +++ b/packages/tendermint-rpc/src/hasher.ts @@ -1,14 +1,7 @@ import { Sha256, sha256 } from "@cosmjs/crypto"; -import { - encodeBlockId, - encodeBytes, - encodeInt, - encodeString, - encodeTime, - encodeVersion, -} from "../../encodings"; -import { Header } from "../../responses"; +import { encodeBlockId, encodeBytes, encodeInt, encodeString, encodeTime, encodeVersion } from "./encodings"; +import { Header } from "./responses"; // hash is sha256 // https://github.com/tendermint/tendermint/blob/master/UPGRADING.md#v0260