fixed nil SystemInfo

olimdzhon · Jul 26, 2024 · 5581d75 · 5581d75
1 parent 23d9125
commit 5581d75
Show file tree

Hide file tree

Showing 19 changed files with 94 additions and 113 deletions.
diff --git a/api/checkers/checkers/genesis.pulsar.go b/api/checkers/checkers/genesis.pulsar.go
diff --git a/api/checkers/checkers/module/module.pulsar.go b/api/checkers/checkers/module/module.pulsar.go
diff --git a/api/checkers/checkers/params.pulsar.go b/api/checkers/checkers/params.pulsar.go
diff --git a/api/checkers/checkers/query.pulsar.go b/api/checkers/checkers/query.pulsar.go
diff --git a/api/checkers/checkers/query_grpc.pb.go b/api/checkers/checkers/query_grpc.pb.go
diff --git a/api/checkers/checkers/stored_game.pulsar.go b/api/checkers/checkers/stored_game.pulsar.go
diff --git a/api/checkers/checkers/system_info.pulsar.go b/api/checkers/checkers/system_info.pulsar.go
diff --git a/api/checkers/checkers/tx.pulsar.go b/api/checkers/checkers/tx.pulsar.go
diff --git a/api/checkers/checkers/tx_grpc.pb.go b/api/checkers/checkers/tx_grpc.pb.go
diff --git a/x/checkers/module/genesis.go b/x/checkers/module/genesis.go
@@ -10,9 +10,8 @@ import (
 // InitGenesis initializes the module's state from a provided genesis state.
 func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) {
 	// Set if defined
-	if genState.SystemInfo != nil {
-		k.SetSystemInfo(ctx, *genState.SystemInfo)
-	}
+	k.SetSystemInfo(ctx, genState.SystemInfo)
+
 	// Set all the storedGame
 	for _, elem := range genState.StoredGameList {
 		k.SetStoredGame(ctx, elem)
@@ -31,7 +30,7 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	// Get all systemInfo
 	systemInfo, found := k.GetSystemInfo(ctx)
 	if found {
-		genesis.SystemInfo = &systemInfo
+		genesis.SystemInfo = systemInfo
 	}
 	genesis.StoredGameList = k.GetAllStoredGame(ctx)
 	// this line is used by starport scaffolding # genesis/module/export

diff --git a/x/checkers/module/genesis_test.go b/x/checkers/module/genesis_test.go
@@ -14,7 +14,7 @@ func TestGenesis(t *testing.T) {
 	genesisState := types.GenesisState{
 		Params: types.DefaultParams(),
 
-		SystemInfo: &types.SystemInfo{
+		SystemInfo: types.SystemInfo{
 			NextId: 67,
 		},
 		StoredGameList: []types.StoredGame{

diff --git a/x/checkers/types/genesis.go b/x/checkers/types/genesis.go
@@ -10,7 +10,9 @@ const DefaultIndex uint64 = 1
 // DefaultGenesis returns the default genesis state
 func DefaultGenesis() *GenesisState {
 	return &GenesisState{
-		SystemInfo:     nil,
+		SystemInfo: SystemInfo{
+			NextId: uint64(DefaultIndex),
+		},
 		StoredGameList: []StoredGame{},
 		// this line is used by starport scaffolding # genesis/types/default
 		Params: DefaultParams(),

diff --git a/x/checkers/types/genesis.pb.go b/x/checkers/types/genesis.pb.go
diff --git a/x/checkers/types/genesis_test.go b/x/checkers/types/genesis_test.go
@@ -22,7 +22,7 @@ func TestGenesisState_Validate(t *testing.T) {
 			desc: "valid genesis state",
 			genState: &types.GenesisState{
 
-				SystemInfo: &types.SystemInfo{
+				SystemInfo: types.SystemInfo{
 					NextId: 100,
 				},
 				StoredGameList: []types.StoredGame{