Use CometClient interface

This commit is contained in:
Simon Warta 2023-11-07 11:34:16 +01:00
parent a4e50df3cb
commit 09482d33d2
11 changed files with 22 additions and 32 deletions

View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { encodePubkey } from "@cosmjs/proto-signing";
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } 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";
@ -9,9 +9,7 @@ import { QueryClient } from "../../queryclient";
import { nonExistentAddress, pendingWithoutSimapp, simapp, unused, validator } from "../../testutils.spec";
import { AuthExtension, setupAuthExtension } from "./queries";
async function makeClientWithAuth(
rpcUrl: string,
): Promise<[QueryClient & AuthExtension, Tendermint34Client]> {
async function makeClientWithAuth(rpcUrl: string): Promise<[QueryClient & AuthExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupAuthExtension), cometClient];
}

View File

@ -1,6 +1,6 @@
import { makeCosmoshubPath } from "@cosmjs/amino";
import { coins, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { assertDefined, sleep } from "@cosmjs/utils";
import { GenericAuthorization } from "cosmjs-types/cosmos/authz/v1beta1/authz";
@ -18,9 +18,7 @@ import {
} from "../../testutils.spec";
import { AuthzExtension, setupAuthzExtension } from "./queries";
async function makeClientWithAuthz(
rpcUrl: string,
): Promise<[QueryClient & AuthzExtension, Tendermint34Client]> {
async function makeClientWithAuthz(rpcUrl: string): Promise<[QueryClient & AuthzExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupAuthzExtension), cometClient];
}

View File

@ -1,4 +1,4 @@
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { QueryClient } from "../../queryclient";
import {
@ -10,9 +10,7 @@ import {
} from "../../testutils.spec";
import { BankExtension, setupBankExtension } from "./queries";
async function makeClientWithBank(
rpcUrl: string,
): Promise<[QueryClient & BankExtension, Tendermint34Client]> {
async function makeClientWithBank(rpcUrl: string): Promise<[QueryClient & BankExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupBankExtension), cometClient];
}

View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { coin, coins, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { sleep } from "@cosmjs/utils";
import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
@ -20,7 +20,7 @@ import { DistributionExtension, setupDistributionExtension } from "./queries";
async function makeClientWithDistribution(
rpcUrl: string,
): Promise<[QueryClient & DistributionExtension, Tendermint34Client]> {
): Promise<[QueryClient & DistributionExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupDistributionExtension), cometClient];
}

View File

@ -1,7 +1,7 @@
import { coin, coins, makeCosmoshubPath } from "@cosmjs/amino";
import { toAscii } from "@cosmjs/encoding";
import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { assert, sleep } from "@cosmjs/utils";
import {
ProposalStatus,
@ -28,7 +28,7 @@ import {
import { MsgDelegateEncodeObject, MsgSubmitProposalEncodeObject, MsgVoteEncodeObject } from "../";
import { GovExtension, setupGovExtension } from "./queries";
async function makeClientWithGov(rpcUrl: string): Promise<[QueryClient & GovExtension, Tendermint34Client]> {
async function makeClientWithGov(rpcUrl: string): Promise<[QueryClient & GovExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupGovExtension), cometClient];
}

View File

@ -1,11 +1,11 @@
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { QueryClient } from "../../queryclient";
import { simapp } from "../../testutils.spec";
import * as ibcTest from "./ibctestdata.spec";
import { IbcExtension, setupIbcExtension } from "./queries";
async function makeClientWithIbc(rpcUrl: string): Promise<[QueryClient & IbcExtension, Tendermint34Client]> {
async function makeClientWithIbc(rpcUrl: string): Promise<[QueryClient & IbcExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupIbcExtension), cometClient];
}

View File

@ -1,12 +1,10 @@
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } 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, Tendermint34Client]> {
async function makeClientWithMint(rpcUrl: string): Promise<[QueryClient & MintExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupMintExtension), cometClient];
}

View File

@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { QueryClient } from "../../queryclient";
import { pendingWithoutSimapp, simapp } from "../../testutils.spec";
@ -7,7 +7,7 @@ import { setupSlashingExtension, SlashingExtension } from "./queries";
async function makeClientWithSlashing(
rpcUrl: string,
): Promise<[QueryClient & SlashingExtension, Tendermint34Client]> {
): Promise<[QueryClient & SlashingExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupSlashingExtension), cometClient];
}

View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { coin, coins, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { sleep } from "@cosmjs/utils";
import { MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
@ -18,9 +18,7 @@ import {
import { MsgDelegateEncodeObject, MsgUndelegateEncodeObject } from "./messages";
import { setupStakingExtension, StakingExtension } from "./queries";
async function makeClientWithStaking(
rpcUrl: string,
): Promise<[QueryClient & StakingExtension, Tendermint34Client]> {
async function makeClientWithStaking(rpcUrl: string): Promise<[QueryClient & StakingExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupStakingExtension), cometClient];
}

View File

@ -1,5 +1,5 @@
import { coin, coins, DirectSecp256k1HdWallet, Registry } from "@cosmjs/proto-signing";
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { assertDefined, sleep } from "@cosmjs/utils";
import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
@ -18,7 +18,7 @@ import {
} from "../../testutils.spec";
import { setupTxExtension, TxExtension } from "./queries";
async function makeClientWithTx(rpcUrl: string): Promise<[QueryClient & TxExtension, Tendermint34Client]> {
async function makeClientWithTx(rpcUrl: string): Promise<[QueryClient & TxExtension, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient, setupTxExtension), cometClient];
}

View File

@ -2,7 +2,7 @@
import { coin } from "@cosmjs/amino";
import { toAscii } from "@cosmjs/encoding";
import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { CometClient, Tendermint34Client } from "@cosmjs/tendermint-rpc";
import { assert } from "@cosmjs/utils";
import { Metadata } from "cosmjs-types/cosmos/bank/v1beta1/bank";
import {
@ -24,7 +24,7 @@ import {
} from "../testutils.spec";
import { QueryClient } from "./queryclient";
async function makeClient(rpcUrl: string): Promise<[QueryClient, Tendermint34Client]> {
async function makeClient(rpcUrl: string): Promise<[QueryClient, CometClient]> {
const cometClient = await Tendermint34Client.connect(rpcUrl);
return [QueryClient.withExtensions(cometClient), cometClient];
}