Make env vars simapp42/simapp44 specific

cosmos · Oct 24, 2021 · a2b6e74 · a2b6e74
1 parent f89d490
commit a2b6e74
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 57 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -146,8 +146,8 @@ jobs:
           environment:
             LAUNCHPAD_ENABLED: 1
             ERC20_ENABLED: 1
-            SIMAPP_ENABLED: 1
-            SLOW_SIMAPP_ENABLED: 1
+            SIMAPP42_ENABLED: 1
+            SLOW_SIMAPP42_ENABLED: 1
             TENDERMINT_ENABLED: 1
             SOCKETSERVER_ENABLED: 1
             SKIP_BUILD: 1
@@ -266,8 +266,8 @@ jobs:
           environment:
             LAUNCHPAD_ENABLED: 1
             ERC20_ENABLED: 1
-            SIMAPP_ENABLED: 1
-            SLOW_SIMAPP_ENABLED: 1
+            SIMAPP42_ENABLED: 1
+            SLOW_SIMAPP42_ENABLED: 1
             TENDERMINT_ENABLED: 1
             SOCKETSERVER_ENABLED: 1
             SKIP_BUILD: 1
@@ -382,8 +382,8 @@ jobs:
           environment:
             LAUNCHPAD_ENABLED: 1
             ERC20_ENABLED: 1
-            SIMAPP_ENABLED: 1
-            SLOW_SIMAPP_ENABLED: 1
+            SIMAPP42_ENABLED: 1
+            SLOW_SIMAPP42_ENABLED: 1
             TENDERMINT_ENABLED: 1
             SOCKETSERVER_ENABLED: 1
             SKIP_BUILD: 1
@@ -484,8 +484,8 @@ jobs:
           environment:
             LAUNCHPAD_ENABLED: 1
             ERC20_ENABLED: 1
-            SIMAPP_ENABLED: 1
-            SLOW_SIMAPP_ENABLED: 1
+            SIMAPP42_ENABLED: 1
+            SLOW_SIMAPP42_ENABLED: 1
             TENDERMINT_ENABLED: 1
             SOCKETSERVER_ENABLED: 1
             SKIP_BUILD: 1

diff --git a/packages/cli/run_examples.sh b/packages/cli/run_examples.sh
@@ -2,7 +2,7 @@
 set -o errexit -o nounset -o pipefail
 command -v shellcheck >/dev/null && shellcheck "$0"
 
-if [ -n "${SIMAPP_ENABLED:-}" ]; then
+if [ -n "${SIMAPP42_ENABLED:-}" ]; then
   yarn node ./bin/cosmwasm-cli --init examples/cosmwasm.ts --code "process.exit(0)"
 fi
 if [ -n "${LAUNCHPAD_ENABLED:-}" ]; then
@@ -13,6 +13,6 @@ yarn node ./bin/cosmwasm-cli --init examples/generate_address.ts --code "process
 yarn node ./bin/cosmwasm-cli --init examples/local_faucet.ts --code "process.exit(0)"
 yarn node ./bin/cosmwasm-cli --init examples/mask.ts --code "process.exit(0)"
 yarn node ./bin/cosmwasm-cli --init examples/multisig_address.ts --code "process.exit(0)"
-if [ -n "${SIMAPP_ENABLED:-}" ]; then
+if [ -n "${SIMAPP42_ENABLED:-}" ]; then
   yarn node ./bin/cosmwasm-cli --init examples/stargate.ts --code "process.exit(0)"
 fi
diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts
@@ -14,8 +14,8 @@ function pendingWithoutLaunchpad(): void {
 }
 
 function pendingWithoutSimapp(): void {
-  if (!process.env.SIMAPP_ENABLED) {
-    return pending("Set SIMAPP_ENABLED to enabled Stargate node-based tests");
+  if (!process.env.SIMAPP42_ENABLED && !process.env.SIMAPP44_ENABLED) {
+    return pending("Set SIMAPP42_ENABLED or SIMAPP44_ENABLED to enabled Stargate node-based tests");
   }
 }
 

diff --git a/packages/ledger-amino/README.md b/packages/ledger-amino/README.md
@@ -63,7 +63,7 @@ and execute:
 
 ```sh
 export LEDGER_ENABLED=1
-export SIMAPP_ENABLED=1
+export SIMAPP42_ENABLED=1
 yarn test
 ```
 

diff --git a/packages/ledger-amino/src/testutils.spec.ts b/packages/ledger-amino/src/testutils.spec.ts
@@ -29,12 +29,12 @@ export function pendingWithoutLaunchpad(): void {
 }
 
 export function simappEnabled(): boolean {
-  return !!process.env.SIMAPP_ENABLED;
+  return !!process.env.SIMAPP42_ENABLED || !!process.env.SIMAPP44_ENABLED;
 }
 
 export function pendingWithoutSimapp(): void {
   if (!simappEnabled()) {
-    return pending("Set SIMAPP_ENABLED to enable Simapp-based tests");
+    return pending("Set SIMAPP42_ENABLED or SIMAPP44_ENABLED to enable Simapp-based tests");
   }
 }