From 45e71f32e806737dbbe82a5ea375bba9d2a3466e Mon Sep 17 00:00:00 2001
From: Vecna <vvecna@uwaterloo.ca>
Date: Mon, 15 Apr 2024 15:21:35 -0400
Subject: [PATCH] Pass date for analysis, compute age correctly

---
 src/analysis.rs | 7 ++++---
 src/lib.rs      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/analysis.rs b/src/analysis.rs
index 6f0c3a6..d6e5686 100644
--- a/src/analysis.rs
+++ b/src/analysis.rs
@@ -1,4 +1,4 @@
-use crate::{get_date, BridgeInfo, BridgeInfoType};
+use crate::{BridgeInfo, BridgeInfoType};
 use lox_library::proto::{level_up::LEVEL_INTERVAL, trust_promotion::UNTRUSTED_INTERVAL};
 use nalgebra::DVector;
 use statrs::distribution::{Continuous, MultivariateNormal};
@@ -50,11 +50,12 @@ pub fn blocked_in(
     analyzer: &dyn Analyzer,
     bridge_info: &BridgeInfo,
     confidence: f64,
+    date: u32,
 ) -> HashSet<String> {
     // TODO: Re-evaluate past days if we have backdated reports
     let mut blocked_in = HashSet::<String>::new();
-    let today = get_date();
-    let age = bridge_info.first_seen - today;
+    let today = date;
+    let age = today - bridge_info.first_seen;
     for (country, info) in &bridge_info.info_by_country {
         if info.blocked {
             // Assume bridges never become unblocked
diff --git a/src/lib.rs b/src/lib.rs
index 6394d41..0d2c233 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -583,7 +583,7 @@ pub fn guess_blockages(
         let mut bridge_info: BridgeInfo =
             bincode::deserialize(&db.get(fingerprint).unwrap().unwrap()).unwrap();
         let mut new_blockages = HashSet::<String>::new();
-        let blocked_in = analysis::blocked_in(analyzer, &bridge_info, confidence);
+        let blocked_in = analysis::blocked_in(analyzer, &bridge_info, confidence, get_date());
         for country in blocked_in {
             let bridge_country_info = bridge_info.info_by_country.get_mut(&country).unwrap();
             if !bridge_country_info.blocked {