mint - fix error being returned

elnosh · Jul 2, 2024 · 915c83c · 915c83c
1 parent e8f5e4e
commit 915c83c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/mint/mint.go b/mint/mint.go
@@ -140,7 +140,8 @@ func (m *Mint) GetMintQuoteState(method, quoteId string) (nut04.PostMintQuoteBol
  // check if the invoice has been paid
  status, err := m.LightningClient.InvoiceStatus(invoice.PaymentHash)
  if err != nil {
- return nut04.PostMintQuoteBolt11Response{}, fmt.Errorf("error checking invoice status: %v", err)
+ msg := fmt.Sprintf("error getting invoice status: %v", err)
+ return nut04.PostMintQuoteBolt11Response{}, cashu.BuildCashuError(msg, cashu.InvoiceErrCode)
  }
  if status.Settled && status.Settled != invoice.Settled {
  invoice.Settled = status.Settled
@@ -172,7 +173,8 @@ func (m *Mint) MintTokens(method, id string, blindedMessages cashu.BlindedMessag
 
  status, err := m.LightningClient.InvoiceStatus(invoice.PaymentHash)
  if err != nil {
- return nil, fmt.Errorf("error checking invoice status: %v", err)
+ msg := fmt.Sprintf("error getting invoice status: %v", err)
+ return nil, cashu.BuildCashuError(msg, cashu.InvoiceErrCode)
  }
  if status.Settled {
  if invoice.Redeemed {

diff --git a/mint/server.go b/mint/server.go
@@ -235,9 +235,10 @@ func (ms *MintServer) mintQuoteState(rw http.ResponseWriter, req *http.Request)
  mintQuoteStateResponse, err := ms.mint.GetMintQuoteState(method, quoteId)
  if err != nil {
  // if error is from lnd, log it but throw generic response
- _, ok := err.(*cashu.Error)
- if !ok {
- ms.writeErr(rw, req, cashu.StandardErr, err.Error())
+ cashuErr, ok := err.(*cashu.Error)
+ if ok && cashuErr.Code == cashu.InvoiceErrCode {
+ ms.writeErr(rw, req, cashu.StandardErr, cashuErr.Error())
+ return
  }
 
  ms.writeErr(rw, req, err)
@@ -266,9 +267,10 @@ func (ms *MintServer) mintTokensRequest(rw http.ResponseWriter, req *http.Reques
  blindedSignatures, err := ms.mint.MintTokens(method, mintReq.Quote, mintReq.Outputs)
  if err != nil {
  // if error is from lnd, log it but throw generic response
- _, ok := err.(*cashu.Error)
- if !ok {
- ms.writeErr(rw, req, cashu.StandardErr, err.Error())
+ cashuErr, ok := err.(*cashu.Error)
+ if ok && cashuErr.Code == cashu.InvoiceErrCode {
+ ms.writeErr(rw, req, cashu.StandardErr, cashuErr.Error())
+ return
  }
 
  ms.writeErr(rw, req, err)