From ad4ab1e37598ddccd1137070c6ba5333397ca6c1 Mon Sep 17 00:00:00 2001
From: Facundo <facundomedica@gmail.com>
Date: Fri, 23 Aug 2024 12:51:46 +0200
Subject: [PATCH] fix tests

---
 contrib/images/simd-env/Dockerfile | 4 ++--
 contrib/images/simd-env/wrapper.sh | 4 ++--
 scripts/init-simapp-v2.sh          | 2 +-
 simapp/simd/cmd/testnet_test.go    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile
index 8ff6675b0379..6661f00334a0 100644
--- a/contrib/images/simd-env/Dockerfile
+++ b/contrib/images/simd-env/Dockerfile
@@ -33,7 +33,7 @@ COPY core/testing/go.mod core/testing/go.sum /work/core/testing/
 RUN go mod download
 
 COPY ./ /work
-RUN LEDGER_ENABLED=false make clean build
+RUN COSMOS_BUILD_OPTIONS=v2 LEDGER_ENABLED=false make clean build
 
 
 FROM alpine AS run
@@ -46,4 +46,4 @@ VOLUME /simd
 WORKDIR /simd
 
 COPY contrib/images/simd-env/wrapper.sh /usr/bin/wrapper.sh
-COPY --from=build /work/build/simd /simd/
+COPY --from=build /work/build/simdv2 /simd/
diff --git a/contrib/images/simd-env/wrapper.sh b/contrib/images/simd-env/wrapper.sh
index d95bf58890ed..c9728a47ef3c 100755
--- a/contrib/images/simd-env/wrapper.sh
+++ b/contrib/images/simd-env/wrapper.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 set -x
 
-BINARY=/simd/${BINARY:-simd}
+BINARY=/simd/${BINARY:-simdv2}
 ID=${ID:-0}
 LOG=${LOG:-simd.log}
 
@@ -11,7 +11,7 @@ if ! [ -f "${BINARY}" ]; then
 	exit 1
 fi
 
-export SIMDHOME="/data/node${ID}/simd"
+export SIMDHOME="/data/node${ID}/simdv2"
 
 if [ -d "$(dirname "${SIMDHOME}"/"${LOG}")" ]; then
   "${BINARY}" --home "${SIMDHOME}" "$@" | tee "${SIMDHOME}/${LOG}"
diff --git a/scripts/init-simapp-v2.sh b/scripts/init-simapp-v2.sh
index a4788dfee838..ca25b4f706c0 100755
--- a/scripts/init-simapp-v2.sh
+++ b/scripts/init-simapp-v2.sh
@@ -19,5 +19,5 @@ jq '.app_state.gov.params.expedited_voting_period = "300s"' $SIMD_HOME/config/ge
 jq '.app_state.mint.minter.inflation = "0.300000000000000000"' $SIMD_HOME/config/genesis.json > temp.json && mv temp.json $SIMD_HOME/config/genesis.json # to change the inflation
 $SIMD_BIN genesis add-genesis-account alice 5000000000stake --keyring-backend test
 $SIMD_BIN genesis add-genesis-account bob 5000000000stake --keyring-backend test
-$SIMD_BIN genesis gentx alice 1000000stake --chain-id demo
+$SIMD_BIN genesis gentx alice 1000000stake --chain-id simapp-v2-chain
 $SIMD_BIN genesis collect-gentxs
\ No newline at end of file
diff --git a/simapp/simd/cmd/testnet_test.go b/simapp/simd/cmd/testnet_test.go
index e15a0b5db2b7..d79e60b42b4b 100644
--- a/simapp/simd/cmd/testnet_test.go
+++ b/simapp/simd/cmd/testnet_test.go
@@ -45,7 +45,7 @@ func Test_TestnetCmd(t *testing.T) {
 	)
 	require.NoError(t, err)
 	require.NotNil(t, moduleManager)
-	require.Len(t, moduleManager.Modules, 8)
+	require.Len(t, moduleManager.Modules, 9) // the registered above + runtime
 
 	home := t.TempDir()
 	cdcOpts := codectestutil.CodecOptions{}