event cleanup

neutron-org · Jul 31, 2024 · baed57e · baed57e
1 parent 4e2bdb8
commit baed57e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/x/dex/keeper/cancel_limit_order.go b/x/dex/keeper/cancel_limit_order.go
@@ -41,7 +41,8 @@ func (k Keeper) CancelLimitOrderCore(
 		pairID.Token1,
 		tradePairID.MakerDenom,
 		tradePairID.TakerDenom,
-		coinsOut,
+		makerCoinOut.Amount,
+		takerCoinOut.Amount,
 		trancheKey,
 	))
 

diff --git a/x/dex/types/events.go b/x/dex/types/events.go
@@ -156,8 +156,9 @@ func CancelLimitOrderEvent(
 	token0 string,
 	token1 string,
 	makerDenom string,
-	tokenOut string,
-	coinsOut sdk.Coins,
+	takerDenom string,
+	makerAmountOut math.Int,
+	takerAmountOut math.Int,
 	trancheKey string,
 ) sdk.Event {
 	attrs := []sdk.Attribute{
@@ -167,8 +168,9 @@ func CancelLimitOrderEvent(
 		sdk.NewAttribute(CancelLimitOrderEventToken0, token0),
 		sdk.NewAttribute(CancelLimitOrderEventToken1, token1),
 		sdk.NewAttribute(CancelLimitOrderEventTokenIn, makerDenom),
-		sdk.NewAttribute(CancelLimitOrderEventTokenOut, tokenOut),
-		sdk.NewAttribute(CancelLimitOrderEventAmountOut, coinsOut.String()),
+		sdk.NewAttribute(CancelLimitOrderEventTokenOut, takerDenom),
+		sdk.NewAttribute(CancelLimitOrderEventTokenInAmountOut, makerAmountOut.String()),
+		sdk.NewAttribute(CancelLimitOrderEventTokenOutAmountOut, takerAmountOut.String()),
 		sdk.NewAttribute(CancelLimitOrderEventTrancheKey, trancheKey),
 	}
 

diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go
@@ -265,14 +265,15 @@ const (
 
 // Cancel LimitOrder Event Attributes
 const (
-	CancelLimitOrderEventKey        = "CancelLimitOrder"
-	CancelLimitOrderEventCreator    = "Creator"
-	CancelLimitOrderEventToken0     = "TokenZero"
-	CancelLimitOrderEventToken1     = "TokenOne"
-	CancelLimitOrderEventTokenIn    = "TokenIn"
-	CancelLimitOrderEventTokenOut   = "TokenOut"
-	CancelLimitOrderEventTrancheKey = "TrancheKey"
-	CancelLimitOrderEventAmountOut  = "AmountOut"
+	CancelLimitOrderEventKey               = "CancelLimitOrder"
+	CancelLimitOrderEventCreator           = "Creator"
+	CancelLimitOrderEventToken0            = "TokenZero"
+	CancelLimitOrderEventToken1            = "TokenOne"
+	CancelLimitOrderEventTokenIn           = "TokenIn"
+	CancelLimitOrderEventTokenOut          = "TokenOut"
+	CancelLimitOrderEventTrancheKey        = "TrancheKey"
+	CancelLimitOrderEventTokenInAmountOut  = "TokenInAmountOut"
+	CancelLimitOrderEventTokenOutAmountOut = "TokenOutAmountOut"
 )
 
 // Tick Update Event Attributes