fix merge conflict

This commit is contained in:
kiwiidb
2023-09-29 15:55:51 +02:00
15 changed files with 276 additions and 35 deletions

View File

@@ -172,14 +172,14 @@ func (controller *KeySendController) SingleKeySend(ctx context.Context, reqBody
HttpStatusCode: 400,
}
}
ok, err := controller.svc.BalanceCheck(ctx, lnPayReq, userID)
resp, err := controller.svc.CheckPaymentAllowed(c.Request().Context(), lnPayReq, userID)
if err != nil {
controller.svc.Logger.Error(err)
return nil, &responses.GeneralServerError
}
if !ok {
controller.svc.Logger.Errorf("User does not have enough balance user_id:%v amount:%v", userID, lnPayReq.PayReq.NumSatoshis)
return nil, &responses.NotEnoughBalanceError
if resp != nil {
c.Logger().Errorf("User does not have enough balance user_id:%v amount:%v", userID, lnPayReq.PayReq.NumSatoshis)
return nil, resp
}
invoice, err := controller.svc.AddOutgoingInvoice(ctx, userID, "", lnPayReq)
if err != nil {