GH-602: Scanner system revamp

masq_lib/src/lib.rs

@@ -22,6 +22,5 @@ pub mod crash_point;
 pub mod data_version;
 pub mod shared_schema;
 pub mod test_utils;
-pub mod type_obfuscation;
 pub mod ui_gateway;
 pub mod ui_traffic_converter;

masq_lib/src/messages.rs

@@ -525,10 +525,10 @@ pub struct UiRatePack {
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct UiScanIntervals {
-    #[serde(rename = "pendingPayableSec")]
-    pub pending_payable_sec: u64,
     #[serde(rename = "payableSec")]
     pub payable_sec: u64,
+    #[serde(rename = "pendingPayableSec")]
+    pub pending_payable_sec: u64,
     #[serde(rename = "receivableSec")]
     pub receivable_sec: u64,
 }
@@ -781,8 +781,8 @@ conversation_message!(UiRecoverWalletsResponse, "recoverWallets");
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum ScanType {
     Payables,
-    Receivables,
     PendingPayables,
+    Receivables,
 }
 
 impl FromStr for ScanType {
@@ -791,8 +791,8 @@ impl FromStr for ScanType {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             s if &s.to_lowercase() == "payables" => Ok(ScanType::Payables),
-            s if &s.to_lowercase() == "receivables" => Ok(ScanType::Receivables),
             s if &s.to_lowercase() == "pendingpayables" => Ok(ScanType::PendingPayables),
+            s if &s.to_lowercase() == "receivables" => Ok(ScanType::Receivables),
             s => Err(format!("Unrecognized ScanType: '{}'", s)),
         }
     }
@@ -1160,10 +1160,10 @@ mod tests {
         let result: Vec<ScanType> = vec![
             "Payables",
             "pAYABLES",
-            "Receivables",
-            "rECEIVABLES",
             "PendingPayables",
             "pENDINGpAYABLES",
+            "Receivables",
+            "rECEIVABLES",
         ]
         .into_iter()
         .map(|s| ScanType::from_str(s).unwrap())
@@ -1174,10 +1174,10 @@ mod tests {
             vec![
                 ScanType::Payables,
                 ScanType::Payables,
-                ScanType::Receivables,
-                ScanType::Receivables,
                 ScanType::PendingPayables,
                 ScanType::PendingPayables,
+                ScanType::Receivables,
+                ScanType::Receivables,
             ]
         )
     }

node/Cargo.toml

@@ -15,7 +15,7 @@ automap = { path = "../automap"}
 backtrace = "0.3.57"
 base64 = "0.13.0"
 bytes = "0.4.12"
-time = {version = "0.3.11", features = [ "macros" ]}
+time = {version = "0.3.11", features = [ "macros", "parsing" ]}
 clap = "2.33.3"
 crossbeam-channel = "0.5.1"
 dirs = "4.0.0"