apply review suggestions

NibiruChain · Sep 15, 2023 · 73fe1ab · 73fe1ab
1 parent 08d524a
commit 73fe1ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/x/perp/v2/keeper/clearing_house.go b/x/perp/v2/keeper/clearing_house.go
@@ -555,7 +555,11 @@ func (k Keeper) afterPositionUpdate(
 	}
 
 	// update user volume
-	k.IncreaseTraderVolume(ctx, traderAddr, positionResp.ExchangedNotionalValue.Abs().TruncateInt())
+	dnrEpoch, err := k.DnREpoch.Get(ctx)
+	if err != nil {
+		return err
+	}
+	k.IncreaseTraderVolume(ctx, dnrEpoch, traderAddr, positionResp.ExchangedNotionalValue.Abs().TruncateInt())
 
 	transferredFee, err := k.transferFee(ctx, market.Pair, traderAddr, positionResp.ExchangedNotionalValue,
 		market.ExchangeFeeRatio, market.EcosystemFundFeeRatio,

diff --git a/x/perp/v2/keeper/dnr.go b/x/perp/v2/keeper/dnr.go
@@ -41,12 +41,7 @@ func (i intValueEncoder) Name() string {
 }
 
 // IncreaseTraderVolume adds the volume to the user's volume for the current epoch.
-func (k Keeper) IncreaseTraderVolume(ctx sdk.Context, user sdk.AccAddress, volume math.Int) {
-	currentEpoch, err := k.DnREpoch.Get(ctx)
-	// the DnREpoch must always exist. Otherwise, the chain was not initted properly.
-	if err != nil {
-		panic(err)
-	}
+func (k Keeper) IncreaseTraderVolume(ctx sdk.Context, currentEpoch uint64, user sdk.AccAddress, volume math.Int) {
 	currentVolume := k.TraderVolumes.GetOr(ctx, collections.Join(user, currentEpoch), math.ZeroInt())
 	newVolume := currentVolume.Add(volume)
 	k.TraderVolumes.Insert(ctx, collections.Join(user, currentEpoch), newVolume)