diff --git a/packages/tendermint-rpc/src/config.spec.ts b/packages/tendermint-rpc/src/config.spec.ts deleted file mode 100644 index 8373923a..00000000 --- a/packages/tendermint-rpc/src/config.spec.ts +++ /dev/null @@ -1,58 +0,0 @@ -export interface ExpectedValues { - /** The Tendermint version as reported by Tendermint itself */ - readonly version: string; - readonly appCreator: string; - readonly p2pVersion: number; - readonly blockVersion: number; - readonly appVersion: number; -} - -export interface TendermintInstance { - readonly url: string; - readonly version: string; - /** rough block time in ms */ - readonly blockTime: number; - /** Values we expect in the backend */ - readonly expected: ExpectedValues; -} - -/** - * Tendermint instances to be tested. - * - * Testing different versions: as a convention, the minor version number is encoded - * in the port 111, e.g. Tendermint 0.21.0 runs on port 11121. To start - * a specific version use: - * TENDERMINT_VERSION=0.29.2 TENDERMINT_PORT=11129 ./scripts/tendermint/start.sh - * - * When more than 1 instances of tendermint are running, stop them manually: - * docker container ls | grep tendermint/tendermint - * docker container kill - */ -export const tendermintInstances: readonly TendermintInstance[] = [ - { - url: "localhost:11133", - version: "0.33.x", - blockTime: 1000, - expected: { - version: "0.33.8", - appCreator: "Cosmoshi Netowoko", - p2pVersion: 7, - blockVersion: 10, - appVersion: 1, - }, - }, - { - url: "localhost:11134", - version: "0.34.x", - blockTime: 500, - expected: { - version: "182fa32", // srsly? - appCreator: "Cosmoshi Netowoko", - p2pVersion: 8, - blockVersion: 11, - appVersion: 1, - }, - }, -]; - -export const defaultInstance: TendermintInstance = tendermintInstances[0]; diff --git a/packages/tendermint-rpc/src/legacy/client.spec.ts b/packages/tendermint-rpc/src/legacy/client.spec.ts index 3bf12c3f..fc1dd0b2 100644 --- a/packages/tendermint-rpc/src/legacy/client.spec.ts +++ b/packages/tendermint-rpc/src/legacy/client.spec.ts @@ -5,14 +5,15 @@ import { sleep } from "@cosmjs/utils"; import { ReadonlyDate } from "readonly-date"; import { Stream } from "xstream"; -import { ExpectedValues, tendermintInstances } from "../config.spec"; import { HttpClient, RpcClient, WebsocketClient } from "../rpcclients"; import { buildKvTx, chainIdMatcher, + ExpectedValues, pendingWithoutTendermint, randomString, tendermintEnabled, + tendermintInstances, tendermintSearchIndexUpdated, } from "../testutil.spec"; import { Adaptor } from "./adaptor"; diff --git a/packages/tendermint-rpc/src/rpcclients/httpclient.spec.ts b/packages/tendermint-rpc/src/rpcclients/httpclient.spec.ts index a1bcbb4f..5d7637cd 100644 --- a/packages/tendermint-rpc/src/rpcclients/httpclient.spec.ts +++ b/packages/tendermint-rpc/src/rpcclients/httpclient.spec.ts @@ -1,5 +1,5 @@ -import { defaultInstance } from "../config.spec"; import { createJsonRpcRequest } from "../jsonrpc"; +import { defaultInstance } from "../testutil.spec"; import { HttpClient } from "./httpclient"; function pendingWithoutTendermint(): void { diff --git a/packages/tendermint-rpc/src/rpcclients/rpcclient.spec.ts b/packages/tendermint-rpc/src/rpcclients/rpcclient.spec.ts index d45eb118..c55cd751 100644 --- a/packages/tendermint-rpc/src/rpcclients/rpcclient.spec.ts +++ b/packages/tendermint-rpc/src/rpcclients/rpcclient.spec.ts @@ -1,5 +1,5 @@ -import { defaultInstance } from "../config.spec"; import { createJsonRpcRequest } from "../jsonrpc"; +import { defaultInstance } from "../testutil.spec"; import { HttpClient } from "./httpclient"; import { instanceOfRpcStreamingClient } from "./rpcclient"; import { WebsocketClient } from "./websocketclient"; diff --git a/packages/tendermint-rpc/src/rpcclients/websocketclient.spec.ts b/packages/tendermint-rpc/src/rpcclients/websocketclient.spec.ts index fe15e9e9..d8496af4 100644 --- a/packages/tendermint-rpc/src/rpcclients/websocketclient.spec.ts +++ b/packages/tendermint-rpc/src/rpcclients/websocketclient.spec.ts @@ -2,8 +2,8 @@ import { Uint53 } from "@cosmjs/math"; import { toListPromise } from "@cosmjs/stream"; import { Stream } from "xstream"; -import { defaultInstance } from "../config.spec"; import { createJsonRpcRequest } from "../jsonrpc"; +import { defaultInstance } from "../testutil.spec"; import { SubscriptionEvent } from "./rpcclient"; import { WebsocketClient } from "./websocketclient"; diff --git a/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts b/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts index a933cc38..e43d2311 100644 --- a/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts +++ b/packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts @@ -5,14 +5,15 @@ import { sleep } from "@cosmjs/utils"; import { ReadonlyDate } from "readonly-date"; import { Stream } from "xstream"; -import { ExpectedValues, tendermintInstances } from "../config.spec"; import { HttpClient, RpcClient, WebsocketClient } from "../rpcclients"; import { buildKvTx, chainIdMatcher, + ExpectedValues, pendingWithoutTendermint, randomString, tendermintEnabled, + tendermintInstances, tendermintSearchIndexUpdated, } from "../testutil.spec"; import { adaptor34 } from "./adaptors"; diff --git a/packages/tendermint-rpc/src/testutil.spec.ts b/packages/tendermint-rpc/src/testutil.spec.ts index 8c815867..c7315bf5 100644 --- a/packages/tendermint-rpc/src/testutil.spec.ts +++ b/packages/tendermint-rpc/src/testutil.spec.ts @@ -1,6 +1,65 @@ import { toAscii } from "@cosmjs/encoding"; import { sleep } from "@cosmjs/utils"; +export interface ExpectedValues { + /** The Tendermint version as reported by Tendermint itself */ + readonly version: string; + readonly appCreator: string; + readonly p2pVersion: number; + readonly blockVersion: number; + readonly appVersion: number; +} + +export interface TendermintInstance { + readonly url: string; + readonly version: string; + /** rough block time in ms */ + readonly blockTime: number; + /** Values we expect in the backend */ + readonly expected: ExpectedValues; +} + +/** + * Tendermint instances to be tested. + * + * Testing different versions: as a convention, the minor version number is encoded + * in the port 111, e.g. Tendermint 0.21.0 runs on port 11121. To start + * a specific version use: + * TENDERMINT_VERSION=0.29.2 TENDERMINT_PORT=11129 ./scripts/tendermint/start.sh + * + * When more than 1 instances of tendermint are running, stop them manually: + * docker container ls | grep tendermint/tendermint + * docker container kill + */ +export const tendermintInstances: readonly TendermintInstance[] = [ + { + url: "localhost:11133", + version: "0.33.x", + blockTime: 1000, + expected: { + version: "0.33.8", + appCreator: "Cosmoshi Netowoko", + p2pVersion: 7, + blockVersion: 10, + appVersion: 1, + }, + }, + { + url: "localhost:11134", + version: "0.34.x", + blockTime: 500, + expected: { + version: "182fa32", // srsly? + appCreator: "Cosmoshi Netowoko", + p2pVersion: 8, + blockVersion: 11, + appVersion: 1, + }, + }, +]; + +export const defaultInstance: TendermintInstance = tendermintInstances[0]; + export const chainIdMatcher = /^[-a-zA-Z0-9]{3,30}$/; export function tendermintEnabled(): boolean {