fix types

realiotech · Jan 14, 2024 · b92123b · b92123b
1 parent de5cbe2
commit b92123b
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 136 deletions.
diff --git a/proto/multistaking/v1/genesis.proto b/proto/multistaking/v1/genesis.proto
@@ -23,7 +23,8 @@ message GenesisState {
       [ (gogoproto.nullable) = false ];
   repeated ValidatorMultiStakingCoin validator_multi_staking_coins = 4
       [ (gogoproto.nullable) = false ];
-  cosmos.staking.v1beta1.GenesisState staking_genesis_state = 5;
+  cosmos.staking.v1beta1.GenesisState staking_genesis_state = 5
+      [ (gogoproto.nullable) = false ];
 }
 
 message MultiStakingCoinInfo {

diff --git a/proto/multistaking/v1/multi_staking.proto b/proto/multistaking/v1/multi_staking.proto
@@ -31,7 +31,8 @@ message MultiStakingLock {
   option (gogoproto.goproto_getters) = false;
   //   option (gogoproto.goproto_stringer) = false;
 
-  LockID lockID = 1;
+  LockID lockID = 1 [ (gogoproto.nullable) = false ];
+  ;
 
   MultiStakingCoin locked_coin = 2 [ (gogoproto.nullable) = false ];
 };
@@ -50,7 +51,8 @@ message MultiStakingUnlock {
   option (gogoproto.goproto_getters) = false;
   option (gogoproto.goproto_stringer) = false;
 
-  UnlockID unlockID = 1;
+  UnlockID unlockID = 1 [ (gogoproto.nullable) = false ];
+  ;
 
   repeated UnlockEntry entries = 2 [ (gogoproto.nullable) = false ];
 }

diff --git a/x/multi-staking/keeper/genesis.go b/x/multi-staking/keeper/genesis.go
@@ -27,7 +27,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, data types.GenesisState) (res []abc
 		k.SetValidatorMultiStakingCoin(ctx, valAddr, valMultiStakingCoin.CoinDenom)
 	}
 
-	return k.stakingKeeper.InitGenesis(ctx, data.StakingGenesisState)
+	return k.stakingKeeper.InitGenesis(ctx, &data.StakingGenesisState)
 }
 
 func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
@@ -69,6 +69,6 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 		MultiStakingUnlocks:        multiStakingUnlocks,
 		MultiStakingCoinInfo:       multiStakingCoinInfos,
 		ValidatorMultiStakingCoins: ValidatorMultiStakingCoinLists,
-		StakingGenesisState:        k.stakingKeeper.ExportGenesis(ctx),
+		StakingGenesisState:        *k.stakingKeeper.ExportGenesis(ctx),
 	}
 }
diff --git a/x/multi-staking/keeper/lock.go b/x/multi-staking/keeper/lock.go
@@ -12,7 +12,7 @@ import (
 func (k Keeper) GetOrCreateMultiStakingLock(ctx sdk.Context, lockID types.LockID) types.MultiStakingLock {
 	multiStakingLock, found := k.GetMultiStakingLock(ctx, lockID)
 	if !found {
-		multiStakingLock = types.NewMultiStakingLock(&lockID, types.MultiStakingCoin{Amount: sdk.ZeroInt()})
+		multiStakingLock = types.NewMultiStakingLock(lockID, types.MultiStakingCoin{Amount: sdk.ZeroInt()})
 	}
 	return multiStakingLock
 }

diff --git a/x/multi-staking/keeper/store.go b/x/multi-staking/keeper/store.go
@@ -87,7 +87,7 @@ func (k Keeper) GetMultiStakingLock(ctx sdk.Context, multiStakingLockID types.Lo
 
 func (k Keeper) SetMultiStakingLock(ctx sdk.Context, multiStakingLock types.MultiStakingLock) {
 	if multiStakingLock.IsEmpty() {
-		k.RemoveMultiStakingLock(ctx, *multiStakingLock.LockID)
+		k.RemoveMultiStakingLock(ctx, multiStakingLock.LockID)
 		return
 	}
 

diff --git a/x/multi-staking/types/genesis.go b/x/multi-staking/types/genesis.go
@@ -8,7 +8,7 @@ func DefaultGenesis() *GenesisState {
 	stakingGenesis := stakingtypes.DefaultGenesisState()
 
 	return &GenesisState{
-		StakingGenesisState: stakingGenesis,
+		StakingGenesisState: *stakingGenesis,
 	}
 }
 

diff --git a/x/multi-staking/types/genesis.pb.go b/x/multi-staking/types/genesis.pb.go
diff --git a/x/multi-staking/types/lock.go b/x/multi-staking/types/lock.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func NewMultiStakingLock(lockID *LockID, lockedCoin MultiStakingCoin) MultiStakingLock {
+func NewMultiStakingLock(lockID LockID, lockedCoin MultiStakingCoin) MultiStakingLock {
 	return MultiStakingLock{
 		LockID:     lockID,
 		LockedCoin: lockedCoin,