refactor test

irisnet · Jul 3, 2024 · 14ac05a · 14ac05a
1 parent e903d9f
commit 14ac05a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 29 deletions.
diff --git a/e2e/random/query.go b/e2e/random/query.go
@@ -28,7 +28,7 @@ type QueryTestSuite struct {
 
 // SetupSuite sets up test suite
 func (s *QueryTestSuite) SetupSuite() {
-	s.SetModifyConfigFn(func(cfg *network.Config) {
+	s.SetupSuiteWithModifyConfigFn(func(cfg *network.Config) {
 		var serviceGenState servicetypes.GenesisState
 		cfg.Codec.MustUnmarshalJSON(cfg.GenesisState[servicetypes.ModuleName], &serviceGenState)
 
@@ -43,7 +43,6 @@ func (s *QueryTestSuite) SetupSuite() {
 		)
 		cfg.GenesisState[servicetypes.ModuleName] = cfg.Codec.MustMarshalJSON(&serviceGenState)
 	})
-	s.TestSuite.SetupSuite()
 }
 
 // TestQueryCmd tests all query command in the nft module

diff --git a/e2e/random/tx.go b/e2e/random/tx.go
@@ -27,7 +27,7 @@ type TxTestSuite struct {
 
 // SetupSuite sets up test suite
 func (s *TxTestSuite) SetupSuite() {
-	s.SetModifyConfigFn(func(cfg *network.Config) {
+	s.SetupSuiteWithModifyConfigFn(func(cfg *network.Config) {
 		var serviceGenState servicetypes.GenesisState
 		cfg.Codec.MustUnmarshalJSON(cfg.GenesisState[servicetypes.ModuleName], &serviceGenState)
 
@@ -42,7 +42,6 @@ func (s *TxTestSuite) SetupSuite() {
 		)
 		cfg.GenesisState[servicetypes.ModuleName] = cfg.Codec.MustMarshalJSON(&serviceGenState)
 	})
-	s.TestSuite.SetupSuite()
 }
 
 // TestTxCmd tests all tx command in the nft module

diff --git a/e2e/service/query.go b/e2e/service/query.go
@@ -27,7 +27,7 @@ type QueryTestSuite struct {
 
 // SetupSuite sets up test suite
 func (s *QueryTestSuite) SetupSuite() {
-	s.SetModifyConfigFn(func(cfg *network.Config) {
+	s.SetupSuiteWithModifyConfigFn(func(cfg *network.Config) {
 		var serviceGenesisState servicetypes.GenesisState
 		cfg.Codec.MustUnmarshalJSON(cfg.GenesisState[servicetypes.ModuleName], &serviceGenesisState)
 
@@ -36,7 +36,6 @@ func (s *QueryTestSuite) SetupSuite() {
 		cfg.GenesisState[servicetypes.ModuleName] = cfg.Codec.MustMarshalJSON(&serviceGenesisState)
 		cfg.NumValidators = 1
 	})
-	s.TestSuite.SetupSuite()
 }
 
 // TestQueryCmd tests all query command in the service module

diff --git a/e2e/service/tx.go b/e2e/service/tx.go
@@ -27,7 +27,7 @@ type TxTestSuite struct {
 
 // SetupSuite sets up test suite
 func (s *TxTestSuite) SetupSuite() {
-	s.SetModifyConfigFn(func(cfg *network.Config) {
+	s.SetupSuiteWithModifyConfigFn(func(cfg *network.Config) {
 		var serviceGenesisState servicetypes.GenesisState
 		cfg.Codec.MustUnmarshalJSON(cfg.GenesisState[servicetypes.ModuleName], &serviceGenesisState)
 
@@ -36,7 +36,6 @@ func (s *TxTestSuite) SetupSuite() {
 		cfg.GenesisState[servicetypes.ModuleName] = cfg.Codec.MustMarshalJSON(&serviceGenesisState)
 		cfg.NumValidators = 1
 	})
-	s.TestSuite.SetupSuite()
 }
 
 // TestQueryCmd tests all query command in the service module

diff --git a/e2e/suite.go b/e2e/suite.go
@@ -15,39 +15,44 @@ type ModifyConfigFn = func(cfg *network.Config)
 type TestSuite struct {
 	suite.Suite
 	simapp.Network
-	modifyConfigFn ModifyConfigFn
+
 }
 
-// SetupSuite creates a new network for integration tests
-func (s *TestSuite) SetupSuite() {
+// SetupSuiteWithModifyConfigFn sets up the end-to-end test suite with the given modifyConfigFn.
+//
+// Parameters:
+// - modifyConfigFn: A function that modifies the config for the test suite.
+//
+// Return type: None.
+func (s *TestSuite) SetupSuiteWithModifyConfigFn(modifyConfigFn ModifyConfigFn) {
 	s.T().Log("setting up e2e test suite")
 
-	depInjectOptions := simapp.DepinjectOptions{
-		Config: AppConfig,
-		Providers: []interface{}{
-			keeper.ProvideMockEVM(),
-			keeper.ProvideMockICS20(),
-		},
-	}
-	if s.modifyConfigFn == nil {
-		s.Network = simapp.SetupNetwork(s.T(), depInjectOptions)
-		return
-	}
-
-	cfg, err := simapp.NewConfig(depInjectOptions)
+	cfg, err := simapp.NewConfig(s.DepinjectOptions())
 	s.Require().NoError(err)
 
-	s.modifyConfigFn(&cfg)
+	modifyConfigFn(&cfg)
 	s.Network = simapp.SetupNetworkWithConfig(s.T(), cfg)
 }
 
+// SetupSuite creates a new network for integration tests
+func (s *TestSuite) SetupSuite() {
+	s.T().Log("setting up e2e test suite")
+	s.Network = simapp.SetupNetwork(s.T(), s.DepinjectOptions())
+}
+
 // TearDownSuite tears down the integration test suite
 func (s *TestSuite) TearDownSuite() {
 	s.T().Log("tearing down e2e test suite")
 	s.Network.Cleanup()
 }
 
-// SetModifyConfigFn sets the modify config function
-func (s *TestSuite) SetModifyConfigFn(fn ModifyConfigFn) {
-	s.modifyConfigFn = fn
-}
+// DepinjectOptions returns the depinject options for the test suite
+func (s *TestSuite) DepinjectOptions() simapp.DepinjectOptions {
+	return simapp.DepinjectOptions{
+		Config: AppConfig,
+		Providers: []interface{}{
+			keeper.ProvideMockEVM(),
+			keeper.ProvideMockICS20(),
+		},
+	}
+}