From af0a8b596b17f2bead78d56d5c0f4d9807a3d1fb Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Mon, 19 May 2025 15:17:08 +0530
Subject: [PATCH] Refactor call to update genesis state

---
 tests/e2e/auction/suite.go  |  4 ----
 tests/e2e/bond/suite.go     |  4 ----
 tests/e2e/common.go         | 28 ++++++++++++++++++----------
 tests/e2e/registry/suite.go |  4 ----
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/tests/e2e/auction/suite.go b/tests/e2e/auction/suite.go
index 04f0b3b3..94285a48 100644
--- a/tests/e2e/auction/suite.go
+++ b/tests/e2e/auction/suite.go
@@ -15,7 +15,6 @@ import (
 	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"git.vdb.to/cerc-io/laconicd/tests/e2e"
 	laconictestcli "git.vdb.to/cerc-io/laconicd/testutil/cli"
 	"git.vdb.to/cerc-io/laconicd/testutil/network"
 	types "git.vdb.to/cerc-io/laconicd/x/auction"
@@ -48,9 +47,6 @@ func (ets *E2ETestSuite) SetupSuite() { //nolint: all
 
 	var err error
 
-	ets.cfg.GenesisState, err = e2e.UpdateStakingGenesisBondDenom(ets.cfg.GenesisState, ets.cfg.Codec)
-	sr.NoError(err)
-
 	ets.network, err = network.New(ets.T(), ets.T().TempDir(), ets.cfg)
 	sr.NoError(err)
 
diff --git a/tests/e2e/bond/suite.go b/tests/e2e/bond/suite.go
index 65843c78..ab992307 100644
--- a/tests/e2e/bond/suite.go
+++ b/tests/e2e/bond/suite.go
@@ -13,7 +13,6 @@ import (
 	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"git.vdb.to/cerc-io/laconicd/tests/e2e"
 	laconictestcli "git.vdb.to/cerc-io/laconicd/testutil/cli"
 	"git.vdb.to/cerc-io/laconicd/testutil/network"
 	bondtypes "git.vdb.to/cerc-io/laconicd/x/bond"
@@ -40,9 +39,6 @@ func (ets *E2ETestSuite) SetupSuite() { //nolint: all
 
 	var err error
 
-	ets.cfg.GenesisState, err = e2e.UpdateStakingGenesisBondDenom(ets.cfg.GenesisState, ets.cfg.Codec)
-	sr.NoError(err)
-
 	ets.network, err = network.New(ets.T(), ets.T().TempDir(), ets.cfg)
 	sr.NoError(err)
 
diff --git a/tests/e2e/common.go b/tests/e2e/common.go
index b32f2a9a..1354b1db 100644
--- a/tests/e2e/common.go
+++ b/tests/e2e/common.go
@@ -58,21 +58,29 @@ func NewTestNetworkFixture() network.TestFixture {
 		return app
 	}
 
+	encodingConfig := testutil.MakeTestEncodingConfig(
+		auth.AppModuleBasic{},
+		bank.AppModuleBasic{},
+		staking.AppModuleBasic{},
+		auctionmodule.AppModule{},
+		bondmodule.AppModule{},
+		registrymodule.AppModule{},
+	)
+
+	genesisState := app.DefaultGenesis()
+	genesisState, err = updateStakingGenesisBondDenom(genesisState, encodingConfig.Codec)
+	if err != nil {
+		panic(fmt.Sprintf("failed to update genesis state: %v", err))
+	}
+
 	return network.TestFixture{
 		AppConstructor: appCtr,
-		GenesisState:   app.DefaultGenesis(),
-		EncodingConfig: testutil.MakeTestEncodingConfig(
-			auth.AppModuleBasic{},
-			bank.AppModuleBasic{},
-			staking.AppModuleBasic{},
-			auctionmodule.AppModule{},
-			bondmodule.AppModule{},
-			registrymodule.AppModule{},
-		),
+		GenesisState:   genesisState,
+		EncodingConfig: encodingConfig,
 	}
 }
 
-func UpdateStakingGenesisBondDenom(genesisState map[string]json.RawMessage, codec codec.Codec) (map[string]json.RawMessage, error) {
+func updateStakingGenesisBondDenom(genesisState map[string]json.RawMessage, codec codec.Codec) (map[string]json.RawMessage, error) {
 	var stakingGenesis stakingtypes.GenesisState
 	if err := codec.UnmarshalJSON(genesisState[stakingtypes.ModuleName], &stakingGenesis); err != nil {
 		return nil, nil
diff --git a/tests/e2e/registry/suite.go b/tests/e2e/registry/suite.go
index 333f27fd..1913e30b 100644
--- a/tests/e2e/registry/suite.go
+++ b/tests/e2e/registry/suite.go
@@ -15,7 +15,6 @@ import (
 	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"git.vdb.to/cerc-io/laconicd/tests/e2e"
 	laconictestcli "git.vdb.to/cerc-io/laconicd/testutil/cli"
 	"git.vdb.to/cerc-io/laconicd/testutil/network"
 	bondtypes "git.vdb.to/cerc-io/laconicd/x/bond"
@@ -57,9 +56,6 @@ func (ets *E2ETestSuite) SetupSuite() {
 	genesisState[registrytypes.ModuleName] = registryGenesisBz
 	ets.cfg.GenesisState = genesisState
 
-	ets.cfg.GenesisState, err = e2e.UpdateStakingGenesisBondDenom(ets.cfg.GenesisState, ets.cfg.Codec)
-	sr.NoError(err)
-
 	ets.network, err = network.New(ets.T(), ets.T().TempDir(), ets.cfg)
 	sr.NoError(err)