GH-605: Teach the PayableScanner on tx retries

masq_lib/src/utils.rs

@@ -520,10 +520,30 @@ macro_rules! hashset {
     };
 }
 
+#[macro_export(local_inner_macros)]
+macro_rules! btreeset {
+    () => {
+        ::std::collections::BTreeSet::new()
+    };
+    ($($val:expr,)+) => {
+        btreeset!($($val),+)
+    };
+    ($($value:expr),+) => {
+        {
+            let mut _bts = ::std::collections::BTreeSet::new();
+            $(
+                let _ = _bts.insert($value);
+            )*
+            _bts
+        }
+    };
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use itertools::Itertools;
+    use std::collections::BTreeSet;
     use std::collections::{BTreeMap, HashMap, HashSet};
     use std::env::current_dir;
     use std::fmt::Write;
@@ -956,4 +976,45 @@ mod tests {
         assert_eq!(hashset_of_string, expected_hashset_of_string);
         assert_eq!(hashset_with_duplicate, expected_hashset_with_duplicate);
     }
+
+    #[test]
+    fn btreeset_macro_works() {
+        let empty_btreeset: BTreeSet<i32> = btreeset!();
+        let btreeset_with_one_element = btreeset!(2);
+        let btreeset_with_multiple_elements = btreeset!(2, 20, 42);
+        let btreeset_with_trailing_comma = btreeset!(2, 20,);
+        let btreeset_of_string = btreeset!("val_a", "val_b");
+        let btreeset_with_duplicate = btreeset!(2, 2);
+
+        let expected_empty_btreeset: BTreeSet<i32> = BTreeSet::new();
+        let mut expected_btreeset_with_one_element = BTreeSet::new();
+        expected_btreeset_with_one_element.insert(2);
+        let mut expected_btreeset_with_multiple_elements = BTreeSet::new();
+        expected_btreeset_with_multiple_elements.insert(2);
+        expected_btreeset_with_multiple_elements.insert(20);
+        expected_btreeset_with_multiple_elements.insert(42);
+        let mut expected_btreeset_with_trailing_comma = BTreeSet::new();
+        expected_btreeset_with_trailing_comma.insert(2);
+        expected_btreeset_with_trailing_comma.insert(20);
+        let mut expected_btreeset_of_string = BTreeSet::new();
+        expected_btreeset_of_string.insert("val_a");
+        expected_btreeset_of_string.insert("val_b");
+        let mut expected_btreeset_with_duplicate = BTreeSet::new();
+        expected_btreeset_with_duplicate.insert(2);
+        assert_eq!(empty_btreeset, expected_empty_btreeset);
+        assert_eq!(
+            btreeset_with_one_element,
+            expected_btreeset_with_one_element
+        );
+        assert_eq!(
+            btreeset_with_multiple_elements,
+            expected_btreeset_with_multiple_elements
+        );
+        assert_eq!(
+            btreeset_with_trailing_comma,
+            expected_btreeset_with_trailing_comma
+        );
+        assert_eq!(btreeset_of_string, expected_btreeset_of_string);
+        assert_eq!(btreeset_with_duplicate, expected_btreeset_with_duplicate);
+    }
 }

multinode_integration_tests/tests/bookkeeping_test.rs

@@ -40,7 +40,7 @@ fn provided_and_consumed_services_are_recorded_in_databases() {
     );
 
     // get all payables from originating node
-    let payables = non_pending_payables(&originating_node);
+    let payables = retrieve_payables(&originating_node);
 
     // Waiting until the serving nodes have finished accruing their receivables
     thread::sleep(Duration::from_secs(10));
@@ -79,9 +79,9 @@ fn provided_and_consumed_services_are_recorded_in_databases() {
     });
 }
 
-fn non_pending_payables(node: &MASQRealNode) -> Vec<PayableAccount> {
+fn retrieve_payables(node: &MASQRealNode) -> Vec<PayableAccount> {
     let payable_dao = payable_dao(node.name());
-    payable_dao.non_pending_payables()
+    payable_dao.retrieve_payables(None)
 }
 
 fn receivables(node: &MASQRealNode) -> Vec<ReceivableAccount> {

multinode_integration_tests/tests/verify_bill_payment.rs

@@ -225,7 +225,7 @@ fn verify_bill_payment() {
     }
 
     let now = Instant::now();
-    while !consuming_payable_dao.non_pending_payables().is_empty()
+    while !consuming_payable_dao.retrieve_payables(None).is_empty()
         && now.elapsed() < Duration::from_secs(10)
     {
         thread::sleep(Duration::from_millis(400));
@@ -400,7 +400,7 @@ fn verify_pending_payables() {
     );
 
     let now = Instant::now();
-    while !consuming_payable_dao.non_pending_payables().is_empty()
+    while !consuming_payable_dao.retrieve_payables(None).is_empty()
         && now.elapsed() < Duration::from_secs(10)
     {
         thread::sleep(Duration::from_millis(400));
@@ -437,7 +437,7 @@ fn verify_pending_payables() {
         .tmb(0),
     );
 
-    assert!(consuming_payable_dao.non_pending_payables().is_empty());
+    assert!(consuming_payable_dao.retrieve_payables(None).is_empty());
     MASQNodeUtils::assert_node_wrote_log_containing(
         real_consuming_node.name(),
         "Found 3 pending payables to process",