fix: sh-testnet

rollchains · Jul 1, 2024 · 5559512 · 5559512
1 parent 150c2a0
commit 5559512
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/simapp/Makefile b/simapp/Makefile
@@ -200,6 +200,7 @@ proto-gen:
 	@$(protoImage) sh ./scripts/protocgen.sh
 # generate the stubs for the proto files from the proto directory
 	@spawn stub-gen
+	@go mod tidy
 
 proto-format:
 	@echo "Formatting Protobuf files"
@@ -300,6 +301,7 @@ testnet: setup-testnet
 
 sh-testnet: mod-tidy
 	CHAIN_ID="localchain-1" BLOCK_TIME="1000ms" CLEAN=true sh scripts/test_node.sh
+	CHAIN_ID="localchain-1" BLOCK_TIME="1000ms" CLEAN=true sh scripts/test_ics_node.sh
 
 .PHONY: setup-testnet set-testnet-configs testnet testnet-basic sh-testnet
 

diff --git a/simapp/proto/ibcmiddleware/module/v1/module.proto b/simapp/proto/ibcmiddleware/module/v1/module.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package strangelove_ventures.simapp.ibcmiddleware.module.v1;
+package ibcmiddleware.module.v1;
 
 import "cosmos/app/v1alpha1/module.proto";
 

diff --git a/spawn/remove_features.go b/spawn/remove_features.go
@@ -106,6 +106,13 @@ func (fc *FileContent) RemoveDisabledFeatures(cfg *NewChainConfig) {
 		fc.RemoveStandardTestNodeScript()
 		fc.HandleAllTagged("not-ics") // interchaintest
 		fc.removePacketForwardTestOnly()
+		if fc.ContainsPath("Makefile") {
+			fc.RemoveLineWithAnyMatch("scripts/test_node.sh")
+		}
+	} else {
+		if fc.ContainsPath("Makefile") {
+			fc.RemoveLineWithAnyMatch("scripts/test_ics_node.sh")
+		}
 	}
 
 	// remove any left over `// spawntag:` comments