From 4348cee45f7db5d4d99b7510fc670aab1d310950 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 6 Apr 2023 16:52:52 +0200
Subject: [PATCH] Add SIMAPP47_ENABLED/SLOW_SIMAPP47_ENABLED and simapp47 tests

---
 .circleci/config.yml                        |  4 +++-
 packages/faucet/src/faucet.spec.ts          |  4 ++--
 packages/ledger-amino/src/testutils.spec.ts |  4 ++--
 packages/stargate/src/testutils.spec.ts     | 16 ++++++++++++----
 packages/stargate/webpack.web.config.js     |  2 ++
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc46f0d1..f0b6f452 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ workflows:
             - build
           matrix:
             parameters:
-              simapp: ["simapp44", "simapp46"]
+              simapp: ["simapp44", "simapp46", "simapp47"]
       - test-node:
           requires:
             - build
@@ -159,6 +159,7 @@ jobs:
           command: |
             [ "<< parameters.simapp >>" = "simapp44" ] && export SIMAPP44_ENABLED=1 SLOW_SIMAPP44_ENABLED=1
             [ "<< parameters.simapp >>" = "simapp46" ] && export SIMAPP46_ENABLED=1 SLOW_SIMAPP46_ENABLED=1
+            [ "<< parameters.simapp >>" = "simapp47" ] && export SIMAPP47_ENABLED=1 SLOW_SIMAPP47_ENABLED=1
             yarn test --stream
       - run:
           name: Run CLI selftest
@@ -178,6 +179,7 @@ jobs:
           command: |
             [ "<< parameters.simapp >>" = "simapp44" ] && export SIMAPP44_ENABLED=1 SLOW_SIMAPP44_ENABLED=1
             [ "<< parameters.simapp >>" = "simapp46" ] && export SIMAPP46_ENABLED=1 SLOW_SIMAPP46_ENABLED=1
+            [ "<< parameters.simapp >>" = "simapp47" ] && export SIMAPP47_ENABLED=1 SLOW_SIMAPP47_ENABLED=1
             ./run_examples.sh
       - run:
           name: Stop chains
diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts
index dea04ba9..dfea2eda 100644
--- a/packages/faucet/src/faucet.spec.ts
+++ b/packages/faucet/src/faucet.spec.ts
@@ -7,8 +7,8 @@ import { Faucet } from "./faucet";
 import { TokenConfiguration } from "./tokenmanager";
 
 function pendingWithoutSimapp(): void {
-  if (!process.env.SIMAPP44_ENABLED && !process.env.SIMAPP46_ENABLED) {
-    return pending("Set SIMAPP{44,46}_ENABLED to enabled Stargate node-based tests");
+  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");
   }
 }
 
diff --git a/packages/ledger-amino/src/testutils.spec.ts b/packages/ledger-amino/src/testutils.spec.ts
index d6c3fdf9..9c691a0d 100644
--- a/packages/ledger-amino/src/testutils.spec.ts
+++ b/packages/ledger-amino/src/testutils.spec.ts
@@ -19,12 +19,12 @@ export function pendingWithoutLedger(): void {
 }
 
 export function simappEnabled(): boolean {
-  return !!process.env.SIMAPP44_ENABLED || !!process.env.SIMAPP46_ENABLED;
+  return !!process.env.SIMAPP44_ENABLED || !!process.env.SIMAPP46_ENABLED || !!process.env.SIMAPP47_ENABLED;
 }
 
 export function pendingWithoutSimapp(): void {
   if (!simappEnabled()) {
-    return pending("Set SIMAPP{44,46}_ENABLED to enable Simapp-based tests");
+    return pending("Set SIMAPP{44,46,47}_ENABLED to enable Simapp-based tests");
   }
 }
 
diff --git a/packages/stargate/src/testutils.spec.ts b/packages/stargate/src/testutils.spec.ts
index 4efc85f1..9903a753 100644
--- a/packages/stargate/src/testutils.spec.ts
+++ b/packages/stargate/src/testutils.spec.ts
@@ -23,8 +23,12 @@ export function simapp46Enabled(): boolean {
   return !!process.env.SIMAPP46_ENABLED;
 }
 
+export function simapp47Enabled(): boolean {
+  return !!process.env.SIMAPP47_ENABLED;
+}
+
 export function simappEnabled(): boolean {
-  return simapp44Enabled() || simapp46Enabled();
+  return simapp44Enabled() || simapp46Enabled() || simapp47Enabled();
 }
 
 export function pendingWithoutSimapp46(): void {
@@ -35,17 +39,21 @@ export function pendingWithoutSimapp46(): void {
 
 export function pendingWithoutSimapp(): void {
   if (!simappEnabled()) {
-    return pending("Set SIMAPP{44,46}_ENABLED to enable Simapp based tests");
+    return pending("Set SIMAPP{44,46,47}_ENABLED to enable Simapp based tests");
   }
 }
 
 export function slowSimappEnabled(): boolean {
-  return !!process.env.SLOW_SIMAPP44_ENABLED || !!process.env.SLOW_SIMAPP46_ENABLED;
+  return (
+    !!process.env.SLOW_SIMAPP44_ENABLED ||
+    !!process.env.SLOW_SIMAPP46_ENABLED ||
+    !!process.env.SLOW_SIMAPP47_ENABLED
+  );
 }
 
 export function pendingWithoutSlowSimapp(): void {
   if (!slowSimappEnabled()) {
-    return pending("Set SLOW_SIMAPP{44,46}_ENABLED to enable slow Simapp based tests");
+    return pending("Set SLOW_SIMAPP{44,46,47}_ENABLED to enable slow Simapp based tests");
   }
 }
 
diff --git a/packages/stargate/webpack.web.config.js b/packages/stargate/webpack.web.config.js
index 4497154c..3e95fd97 100644
--- a/packages/stargate/webpack.web.config.js
+++ b/packages/stargate/webpack.web.config.js
@@ -21,6 +21,8 @@ module.exports = [
         SLOW_SIMAPP44_ENABLED: "",
         SIMAPP46_ENABLED: "",
         SLOW_SIMAPP46_ENABLED: "",
+        SIMAPP47_ENABLED: "",
+        SLOW_SIMAPP47_ENABLED: "",
       }),
       new webpack.ProvidePlugin({
         Buffer: ["buffer", "Buffer"],