use beacon recip table rather than last beacon table for active beaco…

…ning gateways
helium · Apr 22, 2024 · e306d35 · e306d35
1 parent cb684d2
commit e306d35
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/iot_verifier/src/last_beacon_reciprocity.rs b/iot_verifier/src/last_beacon_reciprocity.rs
@@ -31,6 +31,23 @@ impl LastBeaconReciprocity {
         .await?)
     }
 
+    pub async fn get_all_since<'c, E>(
+        executor: E,
+        timestamp: DateTime<Utc>,
+    ) -> anyhow::Result<Vec<Self>>
+    where
+        E: sqlx::Executor<'c, Database = sqlx::Postgres> + 'c,
+    {
+        Ok(
+            sqlx::query_as::<_, Self>(
+                r#" select * from last_beacon_recip where timestamp >= $1; "#,
+            )
+            .bind(timestamp)
+            .fetch_all(executor)
+            .await?,
+        )
+    }
+
     pub async fn update_last_timestamp(
         txn: &mut Transaction<'_, Postgres>,
         id: &PublicKeyBinary,

diff --git a/iot_verifier/src/tx_scaler.rs b/iot_verifier/src/tx_scaler.rs
@@ -1,7 +1,7 @@
 use crate::{
     gateway_updater::MessageReceiver,
     hex_density::{compute_hex_density_map, GlobalHexMap, HexDensityMap},
-    last_beacon::LastBeacon,
+    last_beacon_reciprocity::LastBeaconReciprocity,
 };
 use chrono::{DateTime, Duration, Utc};
 use futures::future::LocalBoxFuture;
@@ -103,7 +103,7 @@ impl Server {
     ) -> anyhow::Result<HashMap<PublicKeyBinary, DateTime<Utc>>> {
         let interactivity_deadline = now - Duration::minutes(HIP_17_INTERACTIVITY_LIMIT);
         Ok(
-            LastBeacon::get_all_since(&self.pool, interactivity_deadline)
+            LastBeaconReciprocity::get_all_since(&self.pool, interactivity_deadline)
                 .await?
                 .into_iter()
                 .map(|beacon| (beacon.id, beacon.timestamp))