lock and unlock

realiotech · Jan 15, 2024 · f4e9de3 · f4e9de3
1 parent d3d4bf1
commit f4e9de3
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 80 deletions.
diff --git a/proto/multistaking/v1/multi_staking.proto b/proto/multistaking/v1/multi_staking.proto
@@ -31,7 +31,7 @@ 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 +50,7 @@ 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/testing/simapp/test_helpers.go b/testing/simapp/test_helpers.go
@@ -146,7 +146,7 @@ func genesisStateWithValSet(app *SimApp, genesisState GenesisState, valSet *tmty
 		})
 
 		lockId := multistakingtypes.MultiStakingLockID(genAcc.GetAddress().String(), sdk.ValAddress(val.Address).String())
-		lockRecord := multistakingtypes.NewMultiStakingLock(&lockId, valMsCoin)
+		lockRecord := multistakingtypes.NewMultiStakingLock(lockId, valMsCoin)
 
 		locks = append(locks, lockRecord)
 		lockCoins = lockCoins.Add(valMsCoin.ToCoin())

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/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,

diff --git a/x/multi-staking/types/multi_staking.pb.go b/x/multi-staking/types/multi_staking.pb.go