Merge pull request #1823 from cosmos/pending-tests-follow-up

Pending tests follow up

Author: webmaster128

packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts

@@ -106,7 +106,7 @@ describe("CosmWasmClient.getTx and .searchTx", () => {
   let sendSuccessful: TestTxSend | undefined;
 
   beforeAll(async () => {
-    if (wasmdEnabled()) {
+    if (wasmdEnabled) {
       const wallet = await DirectSecp256k1HdWallet.fromMnemonic(alice.mnemonic, { prefix: wasmd.prefix });
       const client = await CosmWasmClient.connect(wasmd.endpoint);
       const unsuccessfulRecipient = makeRandomAddress();

packages/cosmwasm-stargate/src/cosmwasmclient.spec.ts

@@ -354,7 +354,7 @@ describe("CosmWasmClient", () => {
     let contract: HackatomInstance | undefined;
 
     beforeAll(async () => {
-      if (wasmdEnabled()) {
+      if (wasmdEnabled) {
         const wallet = await DirectSecp256k1HdWallet.fromMnemonic(alice.mnemonic, { prefix: wasmd.prefix });
         const client = await SigningCosmWasmClient.connectWithSigner(wasmd.endpoint, wallet);
         const { codeId } = await client.upload(alice.address0, getHackatom().data, defaultUploadFee);
@@ -410,7 +410,7 @@ describe("CosmWasmClient", () => {
     let contract: HackatomInstance | undefined;
 
     beforeAll(async () => {
-      if (wasmdEnabled()) {
+      if (wasmdEnabled) {
         const wallet = await DirectSecp256k1HdWallet.fromMnemonic(alice.mnemonic, { prefix: wasmd.prefix });
         const client = await SigningCosmWasmClient.connectWithSigner(wasmd.endpoint, wallet);
         const { codeId } = await client.upload(alice.address0, getHackatom().data, defaultUploadFee);

packages/cosmwasm-stargate/src/modules/wasm/queries.spec.ts

@@ -131,7 +131,7 @@ describe("WasmExtension", () => {
   let hackatomContractAddress: string | undefined;
 
   beforeAll(async () => {
-    if (wasmdEnabled()) {
+    if (wasmdEnabled) {
       const wallet = await DirectSecp256k1HdWallet.fromMnemonic(alice.mnemonic, { prefix: wasmd.prefix });
       const result = await uploadContract(wallet, hackatom);
       assertIsDeliverTxSuccess(result);

packages/cosmwasm-stargate/src/testutils.spec.ts

@@ -144,12 +144,10 @@ export const deployedIbcReflect = {
   ],
 };
 
-export function wasmdEnabled(): boolean {
-  return !!process.env.WASMD_ENABLED;
-}
+export const wasmdEnabled: boolean = !!globalThis.process?.env.WASMD_ENABLED;
 
 export function pendingWithoutWasmd(): void {
-  if (!wasmdEnabled()) {
+  if (!wasmdEnabled) {
     pending("Set WASMD_ENABLED to enable Wasmd-based tests");
     return;
   }

packages/faucet/src/api/webserver.spec.ts

@@ -2,16 +2,10 @@ import { makeCosmoshubPath } from "@cosmjs/stargate";
 import { sleep } from "@cosmjs/utils";
 
 import { Faucet } from "../faucet";
+import { simappEnabled } from "../testutils.spec";
 import { TokenConfiguration } from "../tokenmanager";
 import { ChainConstants, Webserver } from "./webserver";
 
-function pendingWithoutSimapp(): void {
-  if (!process.env.SIMAPP47_ENABLED && !process.env.SIMAPP50_ENABLED) {
-    pending("Set SIMAPP{47,50}_ENABLED to enable Stargate node-based tests");
-    return;
-  }
-}
-
 const defaultTokenConfig: TokenConfiguration = {
   bankTokens: ["ucosm", "ustake"],
 };
@@ -22,7 +16,7 @@ const faucetMnemonic =
 
 const testingPort = 62222;
 
-describe("Webserver", () => {
+(simappEnabled ? describe : xdescribe)("Webserver", () => {
   const pathBuilder = makeCosmoshubPath;
 
   const rpcUrl = "http://localhost:26658";
@@ -38,7 +32,6 @@ describe("Webserver", () => {
   });
 
   it("can be constructed and started", async () => {
-    pendingWithoutSimapp();
     const faucet = await Faucet.make(
       rpcUrl,
       defaultAddressPrefix,

packages/faucet/src/faucet.spec.ts

@@ -4,10 +4,9 @@ import { makeCosmoshubPath, StargateClient } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
 
 import { Faucet } from "./faucet";
+import { simappEnabled } from "./testutils.spec";
 import { TokenConfiguration } from "./tokenmanager";
 
-const enabled = !!(globalThis.process?.env.SIMAPP47_ENABLED || globalThis.process?.env.SIMAPP50_ENABLED);
-
 const defaultTokenConfig: TokenConfiguration = {
   bankTokens: ["ucosm", "ustake"],
 };
@@ -20,7 +19,7 @@ function makeRandomAddress(): string {
 const faucetMnemonic =
   "economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone";
 
-(enabled ? describe : xdescribe)("Faucet", () => {
+(simappEnabled ? describe : xdescribe)("Faucet", () => {
   const pathBuilder = makeCosmoshubPath;
 
   const apiUrl = "http://localhost:26658";

packages/faucet/src/testutils.spec.ts

@@ -0,0 +1,3 @@
+export const simappEnabled = !!(
+  globalThis.process?.env.SIMAPP47_ENABLED || globalThis.process?.env.SIMAPP50_ENABLED
+);

packages/ledger-amino/src/ledgersigner.spec.ts

@@ -38,7 +38,7 @@ async function createTransport(): Promise<Transport> {
   return TransportClass.create(interactiveTimeout, interactiveTimeout);
 }
 
-(ledgerEnabled() ? describe : xdescribe)("LedgerSigner", () => {
+(ledgerEnabled ? describe : xdescribe)("LedgerSigner", () => {
   const defaultChainId = "testing";
   const defaultFee = calculateFee(100_000, "0.025ucosm");
   const defaultMemo = "Some memo";
@@ -48,7 +48,7 @@ async function createTransport(): Promise<Transport> {
   let transport: Transport;
 
   beforeAll(async () => {
-    if (simappEnabled()) {
+    if (simappEnabled) {
       const wallet = await Secp256k1HdWallet.fromMnemonic(faucet.mnemonic);
       const client = await SigningStargateClient.connectWithSigner(simapp.endpoint, wallet);
       const amount = coins(226644, "ucosm");
@@ -147,7 +147,7 @@ async function createTransport(): Promise<Transport> {
       interactiveTimeout,
     );
 
-    (simappEnabled() ? it : xit)(
+    (simappEnabled ? it : xit)(
       "creates signature accepted by Stargate backend",
       async () => {
         const signer = new LedgerSigner(transport, {

packages/ledger-amino/src/testutils.spec.ts

@@ -8,13 +8,11 @@ export const faucet = {
   address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
 };
 
-export function ledgerEnabled(): boolean {
-  return !!globalThis.process?.env.LEDGER_ENABLED;
-}
+export const ledgerEnabled: boolean = !!globalThis.process?.env.LEDGER_ENABLED;
 
-export function simappEnabled(): boolean {
-  return !!(globalThis.process?.env.SIMAPP47_ENABLED || globalThis.process?.env.SIMAPP50_ENABLED);
-}
+export const simappEnabled: boolean = !!(
+  globalThis.process?.env.SIMAPP47_ENABLED || globalThis.process?.env.SIMAPP50_ENABLED
+);
 
 export const simapp = {
   endpoint: "ws://localhost:26658",

packages/socket/src/queueingstreamingsocket.spec.ts

@@ -146,7 +146,7 @@ describe("QueueingStreamingSocket", () => {
     });
   });
 
-  describe("connectionStatus", () => {
+  (enabled ? describe : xdescribe)("connectionStatus", () => {
     it("exposes connection status", async () => {
       let done!: (() => void) & { fail: (e?: any) => void };
       const ret = new Promise<void>((resolve, reject) => {