Update simapp

ulbqb · Jan 27, 2024 · dd0ab4e · dd0ab4e
1 parent d2e8a54
commit dd0ab4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/simapp/app_config.go b/simapp/app_config.go
@@ -70,12 +70,12 @@ import (
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	_ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
-	_ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	foundationmodulev1 "github.com/Finschia/finschia-sdk/api/lbm/foundation/module/v1"
 	foundation "github.com/Finschia/finschia-sdk/x/foundation"
-	_ "github.com/Finschia/finschia-sdk/x/foundation/module" // import for side-effects
+	_ "github.com/Finschia/finschia-sdk/x/foundation/module"  // import for side-effects
+	_ "github.com/Finschia/finschia-sdk/x/stakingplus/module" // import for side-effects
 )
 
 var (

diff --git a/simapp/app_test.go b/simapp/app_test.go
@@ -44,9 +44,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
-	"github.com/cosmos/cosmos-sdk/x/staking"
 
 	foundationmodule "github.com/Finschia/finschia-sdk/x/foundation/module"
+	stakingplusmodule "github.com/Finschia/finschia-sdk/x/stakingplus/module"
 )
 
 func TestSimAppExportAndBlockedAddrs(t *testing.T) {
@@ -203,7 +203,7 @@ func TestRunMigrations(t *testing.T) {
 					"bank":         1,
 					"auth":         auth.AppModule{}.ConsensusVersion(),
 					"authz":        authzmodule.AppModule{}.ConsensusVersion(),
-					"staking":      staking.AppModule{}.ConsensusVersion(),
+					"staking":      stakingplusmodule.AppModule{}.ConsensusVersion(),
 					"mint":         mint.AppModule{}.ConsensusVersion(),
 					"distribution": distribution.AppModule{}.ConsensusVersion(),
 					"slashing":     slashing.AppModule{}.ConsensusVersion(),
@@ -254,7 +254,7 @@ func TestInitGenesisOnMigration(t *testing.T) {
 			"bank":         bank.AppModule{}.ConsensusVersion(),
 			"auth":         auth.AppModule{}.ConsensusVersion(),
 			"authz":        authzmodule.AppModule{}.ConsensusVersion(),
-			"staking":      staking.AppModule{}.ConsensusVersion(),
+			"staking":      stakingplusmodule.AppModule{}.ConsensusVersion(),
 			"mint":         mint.AppModule{}.ConsensusVersion(),
 			"distribution": distribution.AppModule{}.ConsensusVersion(),
 			"slashing":     slashing.AppModule{}.ConsensusVersion(),

diff --git a/simapp/go.mod b/simapp/go.mod
@@ -20,6 +20,7 @@ require (
 	cosmossdk.io/x/upgrade v0.1.1
 	github.com/Finschia/finschia-sdk/api v0.0.0-20231227090232-78fde403b78c
 	github.com/Finschia/finschia-sdk/x/foundation v0.0.0-00010101000000-000000000000
+	github.com/Finschia/finschia-sdk/x/stakingplus v0.0.0-00010101000000-000000000000
 	github.com/cometbft/cometbft v0.38.2
 	github.com/cosmos/cosmos-db v1.0.0
 	// this version is not used as it is always replaced by the latest Cosmos SDK version
@@ -206,6 +207,7 @@ replace (
 	// Simapp always use the latest version of the finschia-sdk
 	github.com/Finschia/finschia-sdk/api => ../api
 	github.com/Finschia/finschia-sdk/x/foundation => ../x/foundation
+	github.com/Finschia/finschia-sdk/x/stakingplus => ../x/stakingplus
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1