From 0c199f1c72063c3a5bda22a47a422f8b2b7837a8 Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 29 Aug 2024 02:25:07 -0400 Subject: [PATCH] Ensure that empty tranches are deleted instead of being saved as expired tranches --- x/dex/keeper/integration_cancellimitorder_test.go | 12 ++++++++++++ x/dex/keeper/limit_order_tranche.go | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/x/dex/keeper/integration_cancellimitorder_test.go b/x/dex/keeper/integration_cancellimitorder_test.go index 9c12b8d0f..96752f32a 100644 --- a/x/dex/keeper/integration_cancellimitorder_test.go +++ b/x/dex/keeper/integration_cancellimitorder_test.go @@ -51,6 +51,18 @@ func (s *DexTestSuite) TestCancelEntireLimitOrderBOneExists() { s.assertDexBalances(0, 0) s.assertCurr1To0(math.MinInt64) s.assertCurr0To1(math.MaxInt64) + + // Tranche is deleted + tranche, _, found := s.App.DexKeeper.FindLimitOrderTranche( + s.Ctx, + &types.LimitOrderTrancheKey{ + TradePairId: types.MustNewTradePairID("TokenA", "TokenB"), + TickIndexTakerToMaker: 0, + TrancheKey: trancheKey, + }, + ) + s.Nil(tranche) + s.False(found) } func (s *DexTestSuite) TestCancelHigherEntireLimitOrderATwoExistDiffTicksSameDirection() { diff --git a/x/dex/keeper/limit_order_tranche.go b/x/dex/keeper/limit_order_tranche.go index 5ffaee303..b0395f0f6 100644 --- a/x/dex/keeper/limit_order_tranche.go +++ b/x/dex/keeper/limit_order_tranche.go @@ -55,7 +55,7 @@ func (k Keeper) SaveTranche(ctx sdk.Context, tranche *types.LimitOrderTranche) { if tranche.HasTokenIn() { k.SetLimitOrderTranche(ctx, tranche) } else { - k.SetInactiveLimitOrderTranche(ctx, tranche) + k.SaveInactiveTranche(ctx, tranche) k.RemoveLimitOrderTranche(ctx, tranche.Key) ctx.EventManager().EmitEvents(types.GetEventsDecTotalOrders(tranche.Key.TradePairId)) }