From 9d4bb28463b4f15f1245700db49f794135b5633e Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 7 Nov 2023 12:06:58 +0100
Subject: [PATCH] Migrate Tendermint34Client.connect to connectComet in query
 tests

---
 packages/cosmwasm-stargate/src/testutils.spec.ts           | 4 ++--
 packages/stargate/src/modules/auth/queries.spec.ts         | 4 ++--
 packages/stargate/src/modules/authz/queries.spec.ts        | 4 ++--
 packages/stargate/src/modules/bank/queries.spec.ts         | 4 ++--
 packages/stargate/src/modules/distribution/queries.spec.ts | 4 ++--
 packages/stargate/src/modules/gov/queries.spec.ts          | 4 ++--
 packages/stargate/src/modules/ibc/queries.spec.ts          | 4 ++--
 packages/stargate/src/modules/mint/queries.spec.ts         | 4 ++--
 packages/stargate/src/modules/slashing/queries.spec.ts     | 4 ++--
 packages/stargate/src/modules/staking/queries.spec.ts      | 4 ++--
 packages/stargate/src/modules/tx/queries.spec.ts           | 4 ++--
 packages/stargate/src/queryclient/queryclient.spec.ts      | 4 ++--
 packages/stargate/src/signingstargateclient.spec.ts        | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts
index 14129d0b..1eb6d227 100644
--- a/packages/cosmwasm-stargate/src/testutils.spec.ts
+++ b/packages/cosmwasm-stargate/src/testutils.spec.ts
@@ -18,7 +18,7 @@ import {
   setupAuthExtension,
   setupBankExtension,
 } from "@cosmjs/stargate";
-import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { connectComet } from "@cosmjs/tendermint-rpc";
 import { assertDefinedAndNotNull } from "@cosmjs/utils";
 import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing";
 import { AuthInfo, SignDoc, TxBody } from "cosmjs-types/cosmos/tx/v1beta1/tx";
@@ -164,7 +164,7 @@ export function fromOneElementArray<T>(elements: ArrayLike<T>): T {
 export async function makeWasmClient(
   endpoint: string,
 ): Promise<QueryClient & AuthExtension & BankExtension & WasmExtension> {
-  const cometClient = await Tendermint34Client.connect(endpoint);
+  const cometClient = await connectComet(endpoint);
   return QueryClient.withExtensions(cometClient, setupAuthExtension, setupBankExtension, setupWasmExtension);
 }
 
diff --git a/packages/stargate/src/modules/auth/queries.spec.ts b/packages/stargate/src/modules/auth/queries.spec.ts
index f7e746fc..3597eefa 100644
--- a/packages/stargate/src/modules/auth/queries.spec.ts
+++ b/packages/stargate/src/modules/auth/queries.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { encodePubkey } from "@cosmjs/proto-signing";
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 import { assert } from "@cosmjs/utils";
 import { BaseAccount } from "cosmjs-types/cosmos/auth/v1beta1/auth";
 import { Any } from "cosmjs-types/google/protobuf/any";
@@ -10,7 +10,7 @@ import { nonExistentAddress, pendingWithoutSimapp, simapp, unused, validator } f
 import { AuthExtension, setupAuthExtension } from "./queries";
 
 async function makeClientWithAuth(rpcUrl: string): Promise<[QueryClient & AuthExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupAuthExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/authz/queries.spec.ts b/packages/stargate/src/modules/authz/queries.spec.ts
index 21003a50..316fe886 100644
--- a/packages/stargate/src/modules/authz/queries.spec.ts
+++ b/packages/stargate/src/modules/authz/queries.spec.ts
@@ -1,6 +1,6 @@
 import { makeCosmoshubPath } from "@cosmjs/amino";
 import { coins, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 import { assertDefined, sleep } from "@cosmjs/utils";
 import { GenericAuthorization } from "cosmjs-types/cosmos/authz/v1beta1/authz";
 
@@ -18,7 +18,7 @@ import {
 import { AuthzExtension, setupAuthzExtension } from "./queries";
 
 async function makeClientWithAuthz(rpcUrl: string): Promise<[QueryClient & AuthzExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupAuthzExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/bank/queries.spec.ts b/packages/stargate/src/modules/bank/queries.spec.ts
index 6dd95fc8..ab2d7175 100644
--- a/packages/stargate/src/modules/bank/queries.spec.ts
+++ b/packages/stargate/src/modules/bank/queries.spec.ts
@@ -1,4 +1,4 @@
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 
 import { QueryClient } from "../../queryclient";
 import {
@@ -11,7 +11,7 @@ import {
 import { BankExtension, setupBankExtension } from "./queries";
 
 async function makeClientWithBank(rpcUrl: string): Promise<[QueryClient & BankExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupBankExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/distribution/queries.spec.ts b/packages/stargate/src/modules/distribution/queries.spec.ts
index 417ee423..3d65c8bb 100644
--- a/packages/stargate/src/modules/distribution/queries.spec.ts
+++ b/packages/stargate/src/modules/distribution/queries.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { coin, coins, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
@@ -21,7 +21,7 @@ import { DistributionExtension, setupDistributionExtension } from "./queries";
 async function makeClientWithDistribution(
   rpcUrl: string,
 ): Promise<[QueryClient & DistributionExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupDistributionExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/gov/queries.spec.ts b/packages/stargate/src/modules/gov/queries.spec.ts
index a2da4d06..1cb9dbc8 100644
--- a/packages/stargate/src/modules/gov/queries.spec.ts
+++ b/packages/stargate/src/modules/gov/queries.spec.ts
@@ -1,7 +1,7 @@
 import { coin, coins, makeCosmoshubPath } from "@cosmjs/amino";
 import { toAscii } from "@cosmjs/encoding";
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 import { assert, sleep } from "@cosmjs/utils";
 import {
   ProposalStatus,
@@ -28,7 +28,7 @@ import { MsgDelegateEncodeObject, MsgSubmitProposalEncodeObject, MsgVoteEncodeOb
 import { GovExtension, setupGovExtension } from "./queries";
 
 async function makeClientWithGov(rpcUrl: string): Promise<[QueryClient & GovExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupGovExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/ibc/queries.spec.ts b/packages/stargate/src/modules/ibc/queries.spec.ts
index c66919ea..6e07bbab 100644
--- a/packages/stargate/src/modules/ibc/queries.spec.ts
+++ b/packages/stargate/src/modules/ibc/queries.spec.ts
@@ -1,4 +1,4 @@
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 
 import { QueryClient } from "../../queryclient";
 import { simapp } from "../../testutils.spec";
@@ -6,7 +6,7 @@ import * as ibcTest from "./ibctestdata.spec";
 import { IbcExtension, setupIbcExtension } from "./queries";
 
 async function makeClientWithIbc(rpcUrl: string): Promise<[QueryClient & IbcExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupIbcExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/mint/queries.spec.ts b/packages/stargate/src/modules/mint/queries.spec.ts
index c1c444da..e4d13f0d 100644
--- a/packages/stargate/src/modules/mint/queries.spec.ts
+++ b/packages/stargate/src/modules/mint/queries.spec.ts
@@ -1,11 +1,11 @@
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 
 import { QueryClient } from "../../queryclient";
 import { pendingWithoutSimapp, simapp } from "../../testutils.spec";
 import { MintExtension, setupMintExtension } from "./queries";
 
 async function makeClientWithMint(rpcUrl: string): Promise<[QueryClient & MintExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupMintExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/slashing/queries.spec.ts b/packages/stargate/src/modules/slashing/queries.spec.ts
index b17ec17e..4449a14a 100644
--- a/packages/stargate/src/modules/slashing/queries.spec.ts
+++ b/packages/stargate/src/modules/slashing/queries.spec.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 
 import { QueryClient } from "../../queryclient";
 import { pendingWithoutSimapp, simapp } from "../../testutils.spec";
@@ -8,7 +8,7 @@ import { setupSlashingExtension, SlashingExtension } from "./queries";
 async function makeClientWithSlashing(
   rpcUrl: string,
 ): Promise<[QueryClient & SlashingExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupSlashingExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/staking/queries.spec.ts b/packages/stargate/src/modules/staking/queries.spec.ts
index 794d579c..ad7f5a70 100644
--- a/packages/stargate/src/modules/staking/queries.spec.ts
+++ b/packages/stargate/src/modules/staking/queries.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { coin, coins, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
@@ -19,7 +19,7 @@ import { MsgDelegateEncodeObject, MsgUndelegateEncodeObject } from "./messages";
 import { setupStakingExtension, StakingExtension } from "./queries";
 
 async function makeClientWithStaking(rpcUrl: string): Promise<[QueryClient & StakingExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupStakingExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/modules/tx/queries.spec.ts b/packages/stargate/src/modules/tx/queries.spec.ts
index f4c7a7c3..c3ba1785 100644
--- a/packages/stargate/src/modules/tx/queries.spec.ts
+++ b/packages/stargate/src/modules/tx/queries.spec.ts
@@ -1,5 +1,5 @@
 import { coin, coins, DirectSecp256k1HdWallet, Registry } from "@cosmjs/proto-signing";
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 import { assertDefined, sleep } from "@cosmjs/utils";
 import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
@@ -18,7 +18,7 @@ import {
 import { setupTxExtension, TxExtension } from "./queries";
 
 async function makeClientWithTx(rpcUrl: string): Promise<[QueryClient & TxExtension, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient, setupTxExtension), cometClient];
 }
 
diff --git a/packages/stargate/src/queryclient/queryclient.spec.ts b/packages/stargate/src/queryclient/queryclient.spec.ts
index 891f0c50..0a243dda 100644
--- a/packages/stargate/src/queryclient/queryclient.spec.ts
+++ b/packages/stargate/src/queryclient/queryclient.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { coin } from "@cosmjs/amino";
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 import { assert } from "@cosmjs/utils";
 import {
   QueryAllBalancesRequest,
@@ -22,7 +22,7 @@ import {
 import { QueryClient } from "./queryclient";
 
 async function makeClient(rpcUrl: string): Promise<[QueryClient, CometClient]> {
-  const cometClient = await Tendermint34Client.connect(rpcUrl);
+  const cometClient = await connectComet(rpcUrl);
   return [QueryClient.withExtensions(cometClient), cometClient];
 }
 
diff --git a/packages/stargate/src/signingstargateclient.spec.ts b/packages/stargate/src/signingstargateclient.spec.ts
index e8d7f8ae..e5a2cad0 100644
--- a/packages/stargate/src/signingstargateclient.spec.ts
+++ b/packages/stargate/src/signingstargateclient.spec.ts
@@ -8,7 +8,7 @@ import {
   makeCosmoshubPath,
   Registry,
 } from "@cosmjs/proto-signing";
-import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
+import { connectComet } from "@cosmjs/tendermint-rpc";
 import { assert, sleep } from "@cosmjs/utils";
 import { DeepPartial } from "cosmjs-types";
 import { BinaryWriter } from "cosmjs-types/binary";
@@ -187,7 +187,7 @@ describe("SigningStargateClient", () => {
         defaultSigningClientOptions,
       );
 
-      const cometClient = await Tendermint34Client.connect(simapp.tendermintUrlHttp);
+      const cometClient = await connectComet(simapp.tendermintUrlHttp);
       const queryClient = QueryClient.withExtensions(cometClient, setupFeegrantExtension);
       let allowanceExists: boolean;
       try {