refactor: use the built-in max/min to simplify the code (#1258)

findnature · avkr003 · web-flow · commit b1d61adab980 · 2025-05-05T09:23:25.000+05:30
Signed-off-by: findnature &lt;cricis@aliyun.com&gt;
Co-authored-by: Abhinav Kumar &lt;57705190+avkr003@users.noreply.github.com&gt;
diff --git a/x/commitment/types/commitments.go b/x/commitment/types/commitments.go
@@ -137,10 +137,7 @@ func (c Commitments) GetCreatorAccount() sdk.AccAddress {
 }
 
 func (vesting *VestingTokens) VestedSoFar(ctx sdk.Context) math.Int {
-	totalBlocks := ctx.BlockHeight() - vesting.StartBlock
-	if totalBlocks > vesting.NumBlocks {
-		totalBlocks = vesting.NumBlocks
-	}
+	totalBlocks := min(ctx.BlockHeight()-vesting.StartBlock, vesting.NumBlocks)
 	return vesting.TotalAmount.Mul(math.NewInt(totalBlocks)).Quo(math.NewInt(vesting.NumBlocks))
 }
 

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,7 @@ func (c Commitments) GetCreatorAccount() sdk.AccAddress {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`func (vesting *VestingTokens) VestedSoFar(ctx sdk.Context) math.Int {`
`140`		`- totalBlocks := ctx.BlockHeight() - vesting.StartBlock`
`141`		`- if totalBlocks > vesting.NumBlocks {`
`142`		`- totalBlocks = vesting.NumBlocks`
`143`		`- }`
	`140`	`+ totalBlocks := min(ctx.BlockHeight()-vesting.StartBlock, vesting.NumBlocks)`
`144`	`141`	`return vesting.TotalAmount.Mul(math.NewInt(totalBlocks)).Quo(math.NewInt(vesting.NumBlocks))`
`145`	`142`	`}`
`146`	`143`