Add error handler (#378)

Now we anyway return empty quote - even if mint still didn't produce it.

Author: mtbitcr

src/external/mint.rs

@@ -5,6 +5,7 @@ use crate::util::base58_decode;
 use crate::web::data::RequestToMintBitcreditBillPayload;
 use crate::CONFIG;
 use borsh::{to_vec, BorshDeserialize};
+use log::error;
 use moksha_core::primitives::CheckBitcreditQuoteResponse;
 use moksha_core::primitives::{
     BillKeys, CurrencyUnit, PaymentMethod, PostMintQuoteBitcreditResponse,
@@ -49,10 +50,15 @@ pub async fn accept_mint_bitcredit(
     req.await.unwrap()
 }
 
-// Usage of tokio::main to spawn a new runtime is necessary here, because Wallet is'nt Send - but
+// Usage of tokio::main to spawn a new runtime is necessary here, because Wallet isn't Send - but
 // this logic will be replaced soon
 #[tokio::main]
-pub async fn check_bitcredit_quote(bill_id_hex: &str, node_id: &str, bill_id_base58: String) {
+pub async fn check_bitcredit_quote(
+    bill_id_hex: &str,
+    node_id: &str,
+    bill_id_base58: String,
+    quote: BitcreditEbillQuote,
+) {
     let dir = PathBuf::from("./data/wallet".to_string());
     let db_path = dir.join("wallet.db").to_str().unwrap().to_string();
     let localstore = SqliteLocalStore::with_path(db_path.clone())
@@ -71,7 +77,13 @@ pub async fn check_bitcredit_quote(bill_id_hex: &str, node_id: &str, bill_id_bas
         .check_bitcredit_quote(&mint_url, bill_id_hex.to_owned(), node_id.to_owned())
         .await;
 
-    let quote = result.unwrap();
+    let quote = result.unwrap_or_else(|e| {
+        error!("{}", e);
+        CheckBitcreditQuoteResponse {
+            quote: quote.quote_id,
+            amount: quote.sum,
+        }
+    });
 
     if !quote.quote.is_empty() {
         add_bitcredit_quote_and_amount_in_quotes_map(quote.clone(), bill_id_base58);

src/web/handlers/bill.rs

@@ -363,7 +363,7 @@ pub async fn issue_bill(
 
     if bill_payload.drawee == bill_payload.payee {
         return Err(service::Error::Validation(String::from(
-            "Drawer can't be Payee at the same time",
+            "Drawee can't be Payee at the same time",
         )));
     }
 

src/web/handlers/quotes.rs

@@ -28,9 +28,11 @@ pub async fn return_quote(
     if !quote.bill_id.is_empty() && quote.quote_id.is_empty() {
         // Usage of thread::spawn is necessary here, because we spawn a new tokio runtime in the
         // thread, but this logic will be replaced soon
-        thread::spawn(move || check_bitcredit_quote(&copy_id_hex, &local_node_id, copy_id_base58))
-            .join()
-            .expect("Thread panicked");
+        thread::spawn(move || {
+            check_bitcredit_quote(&copy_id_hex, &local_node_id, copy_id_base58, quote.clone())
+        })
+        .join()
+        .expect("Thread panicked");
     }
     quote = get_quote_from_map(&id).ok_or(Error::NotFound)?;
     Ok(Json(quote))