From d0e4c37248ece0b4d6905fcccb8d0d4be7d8fb1e Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 22 Nov 2023 10:38:54 +0100 Subject: [PATCH] Add SIMAPP50_ENABLED+SLOW_SIMAPP50_ENABLED in codebase --- packages/faucet/src/faucet.spec.ts | 9 +++++++-- packages/ledger-amino/src/testutils.spec.ts | 9 +++++++-- packages/stargate/src/testutils.spec.ts | 17 +++++++++++------ packages/stargate/webpack.web.config.js | 2 ++ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts index dfea2eda..b54dfe3b 100644 --- a/packages/faucet/src/faucet.spec.ts +++ b/packages/faucet/src/faucet.spec.ts @@ -7,8 +7,13 @@ import { Faucet } from "./faucet"; import { TokenConfiguration } from "./tokenmanager"; function pendingWithoutSimapp(): void { - if (!process.env.SIMAPP44_ENABLED && !process.env.SIMAPP46_ENABLED && !process.env.SIMAPP47_ENABLED) { - return pending("Set SIMAPP{44,46,47}_ENABLED to enabled Stargate node-based tests"); + if ( + !process.env.SIMAPP44_ENABLED && + !process.env.SIMAPP46_ENABLED && + !process.env.SIMAPP47_ENABLED && + !process.env.SIMAPP50_ENABLED + ) { + return pending("Set SIMAPP{44,46,47,50}_ENABLED to enabled Stargate node-based tests"); } } diff --git a/packages/ledger-amino/src/testutils.spec.ts b/packages/ledger-amino/src/testutils.spec.ts index 9c691a0d..debd6711 100644 --- a/packages/ledger-amino/src/testutils.spec.ts +++ b/packages/ledger-amino/src/testutils.spec.ts @@ -19,12 +19,17 @@ export function pendingWithoutLedger(): void { } export function simappEnabled(): boolean { - return !!process.env.SIMAPP44_ENABLED || !!process.env.SIMAPP46_ENABLED || !!process.env.SIMAPP47_ENABLED; + return ( + !!process.env.SIMAPP44_ENABLED || + !!process.env.SIMAPP46_ENABLED || + !!process.env.SIMAPP47_ENABLED || + !!process.env.SIMAPP50_ENABLED + ); } export function pendingWithoutSimapp(): void { if (!simappEnabled()) { - return pending("Set SIMAPP{44,46,47}_ENABLED to enable Simapp-based tests"); + return pending("Set SIMAPP{44,46,47,50}_ENABLED to enable Simapp-based tests"); } } diff --git a/packages/stargate/src/testutils.spec.ts b/packages/stargate/src/testutils.spec.ts index 662c0c6e..e2167bfb 100644 --- a/packages/stargate/src/testutils.spec.ts +++ b/packages/stargate/src/testutils.spec.ts @@ -28,19 +28,23 @@ export function simapp47Enabled(): boolean { return !!process.env.SIMAPP47_ENABLED; } +export function simapp50Enabled(): boolean { + return !!process.env.SIMAPP50_ENABLED; +} + export function simappEnabled(): boolean { - return simapp44Enabled() || simapp46Enabled() || simapp47Enabled(); + return simapp44Enabled() || simapp46Enabled() || simapp47Enabled() || simapp50Enabled(); } export function pendingWithoutSimapp46OrHigher(): void { - if (!simapp46Enabled() && !simapp47Enabled()) { - return pending("Set SIMAPP46_ENABLED or SIMAPP47_ENABLED to enable Simapp based tests"); + if (!simapp46Enabled() && !simapp47Enabled() && !simapp50Enabled()) { + return pending("Set SIMAPP{46,47,50}_ENABLED to enable Simapp based tests"); } } export function pendingWithoutSimapp(): void { if (!simappEnabled()) { - return pending("Set SIMAPP{44,46,47}_ENABLED to enable Simapp based tests"); + return pending("Set SIMAPP{44,46,47,50}_ENABLED to enable Simapp based tests"); } } @@ -48,13 +52,14 @@ export function slowSimappEnabled(): boolean { return ( !!process.env.SLOW_SIMAPP44_ENABLED || !!process.env.SLOW_SIMAPP46_ENABLED || - !!process.env.SLOW_SIMAPP47_ENABLED + !!process.env.SLOW_SIMAPP47_ENABLED || + !!process.env.SLOW_SIMAPP50_ENABLED ); } export function pendingWithoutSlowSimapp(): void { if (!slowSimappEnabled()) { - return pending("Set SLOW_SIMAPP{44,46,47}_ENABLED to enable slow Simapp based tests"); + return pending("Set SLOW_SIMAPP{44,46,47,50}_ENABLED to enable slow Simapp based tests"); } } diff --git a/packages/stargate/webpack.web.config.js b/packages/stargate/webpack.web.config.js index 3e95fd97..ed148b01 100644 --- a/packages/stargate/webpack.web.config.js +++ b/packages/stargate/webpack.web.config.js @@ -23,6 +23,8 @@ module.exports = [ SLOW_SIMAPP46_ENABLED: "", SIMAPP47_ENABLED: "", SLOW_SIMAPP47_ENABLED: "", + SIMAPP50_ENABLED: "", + SLOW_SIMAPP50_ENABLED: "", }), new webpack.ProvidePlugin({ Buffer: ["buffer", "Buffer"],