bill action tests,add checks that people cant do bill actions on (#465)

Author: zupzup

crates/bcr-ebill-api/src/service/bill_service/mod.rs

@@ -818,6 +818,7 @@ pub mod tests {
         let returned_bills = res.unwrap();
         assert!(returned_bills.len() == 1);
         assert_eq!(returned_bills[0].id, TEST_BILL_ID.to_string());
+        assert!(returned_bills[0].status.payment.requested_to_pay);
         assert!(returned_bills[0].status.payment.paid);
     }
 
@@ -4014,6 +4015,23 @@ pub mod tests {
                 .check_requests_for_expiration(&bill_payment, 1731593928)
                 .unwrap()
         );
+        assert!(
+            !service
+                .check_requests_for_expiration(&bill_payment, 1431593928)
+                .unwrap()
+        );
+        bill_payment.data.maturity_date = "2018-07-15".into(); // before ts
+        assert!(
+            !service
+                .check_requests_for_expiration(&bill_payment, 1531593929)
+                .unwrap()
+        );
+        // 2 days after req to pay, but not yet 2 days after end of day maturity date
+        assert!(
+            !service
+                .check_requests_for_expiration(&bill_payment, 1531780429)
+                .unwrap()
+        );
 
         let mut bill_acceptance = get_baseline_cached_bill(TEST_BILL_ID.to_string());
         bill_acceptance.status.acceptance = BillAcceptanceStatus {

crates/bcr-ebill-api/src/service/bill_service/test_utils.rs

@@ -176,9 +176,11 @@ pub fn get_service(mut ctx: MockBillContext) -> BillService {
             )
         });
     bitcoin_client.expect_generate_link_to_pay().returning(|_,_,_| String::from("bitcoin:1Jfn2nZcJ4T7bhE8FdMRz8T3P3YV4LsWn2?amount=0.01&message=Payment in relation to bill some bill"));
-    ctx.contact_store
-        .expect_get()
-        .returning(|_| Ok(Some(get_baseline_contact())));
+    ctx.contact_store.expect_get().returning(|node_id| {
+        let mut contact = get_baseline_contact();
+        contact.node_id = node_id.to_owned();
+        Ok(Some(contact))
+    });
     ctx.contact_store
         .expect_get_map()
         .returning(|| Ok(HashMap::new()));

crates/bcr-ebill-core/src/bill/validation.rs

@@ -4,7 +4,7 @@ use crate::{
         Block, Blockchain,
         bill::{
             BillBlockchain, BillOpCode, OfferToSellWaitingForPayment, RecourseWaitingForPayment,
-            block::BillRequestRecourseBlockData,
+            block::{BillRecourseReasonBlockData, BillRequestRecourseBlockData},
         },
     },
     constants::{ACCEPT_DEADLINE_SECONDS, PAYMENT_DEADLINE_SECONDS, RECOURSE_DEADLINE_SECONDS},
@@ -180,11 +180,15 @@ pub fn validate_bill_action(
                 }
             };
         }
-        BillAction::Recourse(recoursee, sum, currency, _reason) => {
+        BillAction::Recourse(recoursee, sum, currency, reason) => {
             // not waiting for req to pay
             bill_waiting_for_req_to_pay(blockchain, maturity_date, timestamp, is_paid)?;
             // not waiting for offer to sell
             bill_waiting_for_offer_to_sell(blockchain, bill_keys, timestamp)?;
+            let recourse_reason = match reason {
+                RecourseReason::Pay(_, _) => BillRecourseReasonBlockData::Pay,
+                RecourseReason::Accept => BillRecourseReasonBlockData::Accept,
+            };
 
             if let RecourseWaitingForPayment::Yes(payment_info) = blockchain
                 .is_last_request_to_recourse_block_waiting_for_payment(bill_keys, timestamp)?
@@ -193,6 +197,7 @@ pub fn validate_bill_action(
                     || payment_info.currency != *currency
                     || payment_info.recoursee.node_id != recoursee.node_id
                     || payment_info.recourser.node_id != signer_node_id
+                    || payment_info.reason != recourse_reason
                 {
                     return Err(ValidationError::BillRecourseDataInvalid);
                 }