Merge pull request #1845 from dynst/testutils

webmaster128 · web-flow · commit 8442951eec1f · 2025-10-15T10:05:50.000+02:00
drop '.spec' from testutils.spec.ts file
diff --git a/packages/amino/package.json b/packages/amino/package.json
@@ -14,6 +14,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!*testutils.*",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/amino/src/encoding.spec.ts b/packages/amino/src/encoding.spec.ts
@@ -19,7 +19,7 @@ import {
   testgroup3PubkeyBech32,
   testgroup4,
   testgroup4PubkeyBech32,
-} from "./testutils.spec";
+} from "./testutils";
 
 describe("encoding", () => {
   describe("encodeSecp256k1Pubkey", () => {
diff --git a/packages/amino/src/multisig.spec.ts b/packages/amino/src/multisig.spec.ts
@@ -1,5 +1,5 @@
 import { compareArrays, createMultisigThresholdPubkey } from "./multisig";
-import { test1, test2, test3, testgroup1, testgroup2, testgroup3, testgroup4 } from "./testutils.spec";
+import { test1, test2, test3, testgroup1, testgroup2, testgroup3, testgroup4 } from "./testutils";
 
 describe("multisig", () => {
   describe("compareArrays", () => {
diff --git a/packages/amino/src/secp256k1hdwallet.spec.ts b/packages/amino/src/secp256k1hdwallet.spec.ts
@@ -4,7 +4,7 @@ import { fromBase64, fromHex } from "@cosmjs/encoding";
 import { makeCosmoshubPath } from "./paths";
 import { extractKdfConfiguration, Secp256k1HdWallet } from "./secp256k1hdwallet";
 import { serializeSignDoc, StdSignDoc } from "./signdoc";
-import { base64Matcher } from "./testutils.spec";
+import { base64Matcher } from "./testutils";
 import { executeKdf, KdfConfiguration } from "./wallet";
 
 describe("Secp256k1HdWallet", () => {
diff --git a/packages/amino/src/testutils.ts b/packages/amino/src/testutils.ts
diff --git a/packages/cosmwasm-stargate/package.json b/packages/cosmwasm-stargate/package.json
@@ -14,6 +14,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!*testutils.*",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts
@@ -27,7 +27,7 @@ import {
   pendingWithoutWasmd,
   wasmd,
   wasmdEnabled,
-} from "./testutils.spec";
+} from "./testutils";
 
 interface TestTxSend {
   readonly sender: string;
diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.spec.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.spec.ts
@@ -29,7 +29,7 @@ import {
   unused,
   wasmd,
   wasmdEnabled,
-} from "./testutils.spec";
+} from "./testutils";
 
 interface HackatomInstance {
   readonly instantiateMsg: {
diff --git a/packages/cosmwasm-stargate/src/modules/wasm/queries.spec.ts b/packages/cosmwasm-stargate/src/modules/wasm/queries.spec.ts
@@ -26,7 +26,7 @@ import {
   pendingWithoutWasmd,
   wasmd,
   wasmdEnabled,
-} from "../../testutils.spec";
+} from "../../testutils";
 import {
   MsgExecuteContractEncodeObject,
   MsgInstantiateContractEncodeObject,
diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts
@@ -48,7 +48,7 @@ import {
   unused,
   validator,
   wasmd,
-} from "./testutils.spec";
+} from "./testutils";
 
 describe("SigningCosmWasmClient", () => {
   describe("connectWithSigner", () => {
diff --git a/packages/cosmwasm-stargate/src/testutils.ts b/packages/cosmwasm-stargate/src/testutils.ts
diff --git a/packages/faucet/package.json b/packages/faucet/package.json
@@ -15,6 +15,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!*testutils.*",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/faucet/src/api/webserver.spec.ts b/packages/faucet/src/api/webserver.spec.ts
@@ -2,7 +2,7 @@ import { makeCosmoshubPath } from "@cosmjs/stargate";
 import { sleep } from "@cosmjs/utils";
 
 import { Faucet } from "../faucet";
-import { simappEnabled } from "../testutils.spec";
+import { simappEnabled } from "../testutils";
 import { TokenConfiguration } from "../tokenmanager";
 import { ChainConstants, Webserver } from "./webserver";
 
diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts
@@ -4,7 +4,7 @@ import { makeCosmoshubPath, StargateClient } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
 
 import { Faucet } from "./faucet";
-import { simappEnabled } from "./testutils.spec";
+import { simappEnabled } from "./testutils";
 import { TokenConfiguration } from "./tokenmanager";
 
 const defaultTokenConfig: TokenConfiguration = {
diff --git a/packages/faucet/src/testutils.ts b/packages/faucet/src/testutils.ts
diff --git a/packages/ledger-amino/package.json b/packages/ledger-amino/package.json
@@ -14,6 +14,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!*testutils.*",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/ledger-amino/src/ledgersigner.spec.ts b/packages/ledger-amino/src/ledgersigner.spec.ts
@@ -18,7 +18,7 @@ import { sleep } from "@cosmjs/utils";
 import Transport from "@ledgerhq/hw-transport";
 
 import { LedgerSigner } from "./ledgersigner";
-import { faucet, ledgerEnabled, simapp, simappEnabled } from "./testutils.spec";
+import { faucet, ledgerEnabled, simapp, simappEnabled } from "./testutils";
 
 const interactiveTimeout = 120_000;
 
diff --git a/packages/ledger-amino/src/testutils.ts b/packages/ledger-amino/src/testutils.ts
diff --git a/packages/proto-signing/package.json b/packages/proto-signing/package.json
@@ -15,6 +15,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!*testutils.*",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/proto-signing/src/decode.spec.ts b/packages/proto-signing/src/decode.spec.ts
@@ -5,7 +5,7 @@ import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing";
 import { Any } from "cosmjs-types/google/protobuf/any";
 
 import { decodeTxRaw } from "./decode";
-import { faucet, testVectors } from "./testutils.spec";
+import { faucet, testVectors } from "./testutils";
 
 describe("decode", () => {
   describe("decodeTxRaw", () => {
diff --git a/packages/proto-signing/src/directsecp256k1hdwallet.spec.ts b/packages/proto-signing/src/directsecp256k1hdwallet.spec.ts
@@ -4,7 +4,7 @@ import { fromBase64, fromHex } from "@cosmjs/encoding";
 
 import { DirectSecp256k1HdWallet, extractKdfConfiguration } from "./directsecp256k1hdwallet";
 import { makeAuthInfoBytes, makeSignBytes, makeSignDoc } from "./signing";
-import { base64Matcher, faucet, testVectors } from "./testutils.spec";
+import { base64Matcher, faucet, testVectors } from "./testutils";
 import { executeKdf, KdfConfiguration } from "./wallet";
 
 describe("DirectSecp256k1HdWallet", () => {
diff --git a/packages/proto-signing/src/directsecp256k1wallet.spec.ts b/packages/proto-signing/src/directsecp256k1wallet.spec.ts
@@ -4,7 +4,7 @@ import { fromBase64, fromHex } from "@cosmjs/encoding";
 
 import { DirectSecp256k1Wallet } from "./directsecp256k1wallet";
 import { makeAuthInfoBytes, makeSignBytes, makeSignDoc } from "./signing";
-import { testVectors } from "./testutils.spec";
+import { testVectors } from "./testutils";
 
 describe("DirectSecp256k1Wallet", () => {
   const defaultPrivkey = fromHex("b8c462d2bb0c1a92edf44f735021f16c270f28ee2c3d1cb49943a5e70a3c763e");
diff --git a/packages/proto-signing/src/signing.spec.ts b/packages/proto-signing/src/signing.spec.ts
@@ -7,7 +7,7 @@ import { decodeTxRaw } from "./decode";
 import { DirectSecp256k1HdWallet } from "./directsecp256k1hdwallet";
 import { Registry } from "./registry";
 import { makeSignBytes, makeSignDoc } from "./signing";
-import { faucet, testVectors } from "./testutils.spec";
+import { faucet, testVectors } from "./testutils";
 
 describe("signing", () => {
   const chainId = "simd-testing";
diff --git a/packages/proto-signing/src/testutils.ts b/packages/proto-signing/src/testutils.ts
diff --git a/packages/stargate/package.json b/packages/stargate/package.json
@@ -14,6 +14,7 @@
     "build/",
     "*.md",
     "!*.spec.*",
+    "!*testutils.*",
     "!**/testdata/"
   ],
   "repository": {
diff --git a/packages/stargate/src/modules/auth/queries.spec.ts b/packages/stargate/src/modules/auth/queries.spec.ts
@@ -5,7 +5,7 @@ import { BaseAccount } from "cosmjs-types/cosmos/auth/v1beta1/auth";
 import { Any } from "cosmjs-types/google/protobuf/any";
 
 import { QueryClient } from "../../queryclient";
-import { nonExistentAddress, pendingWithoutSimapp, simapp, unused, validator } from "../../testutils.spec";
+import { nonExistentAddress, pendingWithoutSimapp, simapp, unused, validator } from "../../testutils";
 import { AuthExtension, setupAuthExtension } from "./queries";
 
 async function makeClientWithAuth(rpcUrl: string): Promise<[QueryClient & AuthExtension, CometClient]> {
diff --git a/packages/stargate/src/modules/authz/queries.spec.ts b/packages/stargate/src/modules/authz/queries.spec.ts
@@ -14,7 +14,7 @@ import {
   pendingWithoutSimapp,
   simapp,
   simappEnabled,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { AuthzExtension, setupAuthzExtension } from "./queries";
 
 async function makeClientWithAuthz(rpcUrl: string): Promise<[QueryClient & AuthzExtension, CometClient]> {
diff --git a/packages/stargate/src/modules/bank/queries.spec.ts b/packages/stargate/src/modules/bank/queries.spec.ts
@@ -7,7 +7,7 @@ import {
   pendingWithoutSimapp,
   simapp,
   unused,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { BankExtension, setupBankExtension } from "./queries";
 
 async function makeClientWithBank(rpcUrl: string): Promise<[QueryClient & BankExtension, CometClient]> {
diff --git a/packages/stargate/src/modules/distribution/queries.spec.ts b/packages/stargate/src/modules/distribution/queries.spec.ts
@@ -13,7 +13,7 @@ import {
   simapp,
   simappEnabled,
   validator,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { MsgDelegateEncodeObject } from "../";
 import { DistributionExtension, setupDistributionExtension } from "./queries";
 
diff --git a/packages/stargate/src/modules/gov/messages.spec.ts b/packages/stargate/src/modules/gov/messages.spec.ts
@@ -16,7 +16,7 @@ import {
   simapp50Enabled,
   simappEnabled,
   validator,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { MsgDelegateEncodeObject, MsgSubmitProposalEncodeObject, MsgVoteEncodeObject } from "../";
 import { MsgVoteWeightedEncodeObject } from "./messages";
 
diff --git a/packages/stargate/src/modules/gov/queries.spec.ts b/packages/stargate/src/modules/gov/queries.spec.ts
@@ -23,7 +23,7 @@ import {
   simapp,
   simappEnabled,
   validator,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { MsgDelegateEncodeObject, MsgSubmitProposalEncodeObject, MsgVoteEncodeObject } from "../";
 import { GovExtension, setupGovExtension } from "./queries";
 
diff --git a/packages/stargate/src/modules/ibc/queries.spec.ts b/packages/stargate/src/modules/ibc/queries.spec.ts
@@ -1,7 +1,7 @@
 import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 
 import { QueryClient } from "../../queryclient";
-import { simapp } from "../../testutils.spec";
+import { simapp } from "../../testutils";
 import * as ibcTest from "./ibctestdata.spec";
 import { IbcExtension, setupIbcExtension } from "./queries";
 
diff --git a/packages/stargate/src/modules/mint/queries.spec.ts b/packages/stargate/src/modules/mint/queries.spec.ts
@@ -1,7 +1,7 @@
 import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 
 import { QueryClient } from "../../queryclient";
-import { pendingWithoutSimapp, simapp } from "../../testutils.spec";
+import { pendingWithoutSimapp, simapp } from "../../testutils";
 import { MintExtension, setupMintExtension } from "./queries";
 
 async function makeClientWithMint(rpcUrl: string): Promise<[QueryClient & MintExtension, CometClient]> {
diff --git a/packages/stargate/src/modules/slashing/queries.spec.ts b/packages/stargate/src/modules/slashing/queries.spec.ts
@@ -1,7 +1,7 @@
 import { CometClient, connectComet } from "@cosmjs/tendermint-rpc";
 
 import { QueryClient } from "../../queryclient";
-import { pendingWithoutSimapp, simapp } from "../../testutils.spec";
+import { pendingWithoutSimapp, simapp } from "../../testutils";
 import { setupSlashingExtension, SlashingExtension } from "./queries";
 
 async function makeClientWithSlashing(
diff --git a/packages/stargate/src/modules/staking/messages.spec.ts b/packages/stargate/src/modules/staking/messages.spec.ts
@@ -13,7 +13,7 @@ import {
   pendingWithoutSimapp,
   simapp,
   simapp50Enabled,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { MsgCreateValidatorEncodeObject, MsgEditValidatorEncodeObject } from "./messages";
 
 function changePrefix(address: string, newPrefix: string): string {
diff --git a/packages/stargate/src/modules/staking/queries.spec.ts b/packages/stargate/src/modules/staking/queries.spec.ts
@@ -13,7 +13,7 @@ import {
   simapp,
   simappEnabled,
   validator,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { MsgDelegateEncodeObject, MsgUndelegateEncodeObject } from "./messages";
 import { setupStakingExtension, StakingExtension } from "./queries";
 
diff --git a/packages/stargate/src/modules/tx/queries.spec.ts b/packages/stargate/src/modules/tx/queries.spec.ts
@@ -14,7 +14,7 @@ import {
   simapp,
   simappEnabled,
   validator,
-} from "../../testutils.spec";
+} from "../../testutils";
 import { setupTxExtension, TxExtension } from "./queries";
 
 async function makeClientWithTx(rpcUrl: string): Promise<[QueryClient & TxExtension, CometClient]> {
diff --git a/packages/stargate/src/modules/vesting/messages.spec.ts b/packages/stargate/src/modules/vesting/messages.spec.ts
@@ -10,7 +10,7 @@ import {
   makeRandomAddress,
   pendingWithoutSimapp,
   simapp,
-} from "../../testutils.spec";
+} from "../../testutils";
 
 describe("vesting messages", () => {
   describe("MsgCreateVestingAccount", () => {
diff --git a/packages/stargate/src/multisignature.spec.ts b/packages/stargate/src/multisignature.spec.ts
@@ -13,7 +13,7 @@ import { MsgSendEncodeObject } from "./modules";
 import { makeCompactBitArray, makeMultisignedTxBytes } from "./multisignature";
 import { SignerData, SigningStargateClient } from "./signingstargateclient";
 import { assertIsDeliverTxSuccess, StargateClient } from "./stargateclient";
-import { faucet, pendingWithoutSimapp, simapp } from "./testutils.spec";
+import { faucet, pendingWithoutSimapp, simapp } from "./testutils";
 
 describe("multisignature", () => {
   describe("makeCompactBitArray", () => {
diff --git a/packages/stargate/src/queryclient/queryclient.spec.ts b/packages/stargate/src/queryclient/queryclient.spec.ts
@@ -17,7 +17,7 @@ import {
   pendingWithoutSimapp,
   simapp,
   unused,
-} from "../testutils.spec";
+} from "../testutils";
 import { QueryClient } from "./queryclient";
 
 async function makeClient(rpcUrl: string): Promise<[QueryClient, CometClient]> {
diff --git a/packages/stargate/src/signingstargateclient.spec.ts b/packages/stargate/src/signingstargateclient.spec.ts
@@ -46,7 +46,7 @@ import {
   simapp,
   simapp50Enabled,
   validator,
-} from "./testutils.spec";
+} from "./testutils";
 
 describe("SigningStargateClient", () => {
   describe("constructor", () => {
diff --git a/packages/stargate/src/stargateclient.searchtx.spec.ts b/packages/stargate/src/stargateclient.searchtx.spec.ts
@@ -24,7 +24,7 @@ import {
   pendingWithoutSimapp,
   simapp,
   simappEnabled,
-} from "./testutils.spec";
+} from "./testutils";
 
 interface TestTxSend {
   readonly sender: string;
diff --git a/packages/stargate/src/stargateclient.spec.ts b/packages/stargate/src/stargateclient.spec.ts
@@ -35,7 +35,7 @@ import {
   tendermintIdMatcher,
   unused,
   validator,
-} from "./testutils.spec";
+} from "./testutils";
 
 const resultFailure: DeliverTxResponse = {
   code: 5,
diff --git a/packages/stargate/src/testutils.ts b/packages/stargate/src/testutils.ts
