From a277226db44c0bd6861ba276fdf11edce6d0ab23 Mon Sep 17 00:00:00 2001 From: uvorbs Date: Mon, 15 Apr 2024 11:30:15 +0300 Subject: [PATCH 1/2] log minOutAmount propperly --- service/amount_out.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/service/amount_out.go b/service/amount_out.go index cc177855..8e9137e8 100644 --- a/service/amount_out.go +++ b/service/amount_out.go @@ -26,7 +26,7 @@ func (s *Service) GetQuote(ctx context.Context, symbol models.Symbol, side model return models.QuoteRes{}, models.ErrIterFail } if !it.HasNext() { - logctx.Debug(ctx, "insufficient liquidity", logger.String("symbol", symbol.String()), logger.String("side", side.String()), logger.String("inAmount", inAmount.String()), logger.String("minOutAmount", fmt.Sprintf("%v", minOutAmount))) + logctx.Warn(ctx, "insufficient liquidity", logger.String("symbol", symbol.String()), logger.String("side", side.String()), logger.String("inAmount", inAmount.String()), logger.String("minOutAmount", minOutAmount.String())) return models.QuoteRes{}, models.ErrInsufficientLiquity } res, err = getOutAmountInAToken(ctx, it, inAmount) @@ -34,7 +34,7 @@ func (s *Service) GetQuote(ctx context.Context, symbol models.Symbol, side model } else { // SELL it = s.orderBookStore.GetMaxBid(ctx, symbol) if it == nil { - logctx.Error(ctx, "GetMaxBid failed no orders in iterator") + logctx.Warn(ctx, "GetMaxBid failed no orders in iterator") return models.QuoteRes{}, models.ErrIterFail } if !it.HasNext() { @@ -50,6 +50,7 @@ func (s *Service) GetQuote(ctx context.Context, symbol models.Symbol, side model // apply min amount out threshold if minOutAmount != nil && (*minOutAmount).GreaterThanOrEqual(res.Size) { + logctx.Info(ctx, "minOutAmount was applied", logger.String("minOutAmount", minOutAmount.String()), logger.String("amountOut", res.Size.String())) return models.QuoteRes{}, models.ErrMinOutAmount } From fff7ff4e3fa959a7df51fd4866f3bb648b5544fb Mon Sep 17 00:00:00 2001 From: uv-orbs <82281921+uv-orbs@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:36:35 +0300 Subject: [PATCH 2/2] check order exists before check if cancelled (#180) --- service/taker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/taker.go b/service/taker.go index 76a418ec..d78a4106 100644 --- a/service/taker.go +++ b/service/taker.go @@ -133,7 +133,7 @@ func (s *Service) AbortSwap(ctx context.Context, swapId uuid.UUID) error { orders = append(orders, *order) } // cancelled orders - if order.Cancelled { + if order != nil && order.Cancelled { cancelled = append(cancelled, *order) } }