From d0724eccebaecb63e91a20bf69e78762c1fc4e95 Mon Sep 17 00:00:00 2001
From: Runchao Han <me@runchao.rocks>
Date: Wed, 11 Dec 2024 14:50:41 +1100
Subject: [PATCH] cleanup e2e cmd

---
 .gitignore                     | 2 ++
 Makefile                       | 6 +++---
 tests/e2e/types/test_client.go | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85a7ee8..73b6da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,8 @@
 # Dependency directories (remove the comment below to include it)
 vendor/
 
+.vscode/
+
 # Go workspace file
 coverage.txt
 
diff --git a/Makefile b/Makefile
index f0ff5c9..190a9e9 100644
--- a/Makefile
+++ b/Makefile
@@ -83,8 +83,6 @@ proto-lint:
 ###                             Integration e2e	                            ###
 ###############################################################################
 
-PACKAGES_E2E=$(shell go list ./... | grep '/e2e')
-
 build-ibcsim-bcd:
 	$(MAKE) -C contrib/images ibcsim-bcd
 
@@ -95,4 +93,6 @@ start-bcd-consumer-integration:
 	$(MAKE) -C contrib/images start-bcd-consumer-integration
 
 test-e2e-bcd-consumer-integration: start-bcd-consumer-integration
-	go test -run TestBCDConsumerIntegrationTestSuite -mod=readonly -timeout=60m -v $(PACKAGES_E2E) --tags=e2e
+	@cd tests/e2e
+	@go test -run TestBCDConsumerIntegrationTestSuite -mod=readonly -timeout=60m -v github.com/babylonlabs-io/babylon-sdk/tests/e2e --tags=e2e
+	@cd - 
diff --git a/tests/e2e/types/test_client.go b/tests/e2e/types/test_client.go
index af59d4b..420d6dd 100644
--- a/tests/e2e/types/test_client.go
+++ b/tests/e2e/types/test_client.go
@@ -8,7 +8,6 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm/ibctesting"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/babylonlabs-io/babylon-sdk/demo/app"
-	"github.com/babylonlabs-io/babylon-sdk/x/babylon/types"
 	bbntypes "github.com/babylonlabs-io/babylon-sdk/x/babylon/types"
 	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -123,7 +122,7 @@ func (p *TestConsumerClient) BootstrapContracts() (*ConsumerContract, error) {
 	}
 
 	// instantiate Babylon contract
-	msgInstantiate := types.MsgInstantiateBabylonContracts{
+	msgInstantiate := bbntypes.MsgInstantiateBabylonContracts{
 		Signer:                        p.GetSender().String(),
 		BabylonContractCodeId:         babylonContractWasmId,
 		BtcStakingContractCodeId:      btcStakingContractWasmId,