Remove HexAssignments::test_best

helium · May 24, 2024 · 86d651b · 86d651b
1 parent 3054ebd
commit 86d651b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/hex_assignments/src/assignment.rs b/hex_assignments/src/assignment.rs
@@ -149,13 +149,3 @@ impl HexAssignmentsBuilder {
         })
     }
 }
-
-impl HexAssignments {
-    pub fn test_best() -> Self {
-        Self {
-            footfall: Assignment::A,
-            urbanized: Assignment::A,
-            landtype: Assignment::A,
-        }
-    }
-}
diff --git a/mobile_verifier/src/coverage.rs b/mobile_verifier/src/coverage.rs
@@ -962,8 +962,17 @@ mod test {
     use super::*;
     use chrono::NaiveDate;
     use futures::stream::iter;
+    use hex_assignments::Assignment;
     use hextree::Cell;
 
+    fn hex_assignments_mock() -> HexAssignments {
+        HexAssignments {
+            footfall: Assignment::A,
+            urbanized: Assignment::A,
+            landtype: Assignment::A,
+        }
+    }
+
     /// Test to ensure that if there are multiple radios with different signal levels
     /// in a given hex, that the one with the highest signal level is chosen.
     #[tokio::test]
@@ -997,7 +1006,7 @@ mod test {
                 points: CoverageRewardPoints {
                     coverage_points: dec!(100),
                     boost_multiplier: NonZeroU32::new(1).unwrap(),
-                    hex_assignments: HexAssignments::test_best(),
+                    hex_assignments: hex_assignments_mock(),
                     rank: None
                 },
                 boosted_hex_info: BoostedHex {
@@ -1031,7 +1040,7 @@ mod test {
             signal_power: 0,
             coverage_claim_time,
             inserted_at: DateTime::<Utc>::MIN_UTC,
-            assignments: HexAssignments::test_best(),
+            assignments: hex_assignments_mock(),
         }
     }
 
@@ -1113,7 +1122,7 @@ mod test {
                 points: CoverageRewardPoints {
                     coverage_points: dec!(100),
                     boost_multiplier: NonZeroU32::new(1).unwrap(),
-                    hex_assignments: HexAssignments::test_best(),
+                    hex_assignments: hex_assignments_mock(),
                     rank: None
                 },
                 boosted_hex_info: BoostedHex {
@@ -1157,7 +1166,7 @@ mod test {
                         coverage_points: dec!(4),
                         rank: Some(dec!(1.0)),
                         boost_multiplier: NonZeroU32::new(1).unwrap(),
-                        hex_assignments: HexAssignments::test_best(),
+                        hex_assignments: hex_assignments_mock(),
                     },
                     boosted_hex_info: BoostedHex {
                         location: Cell::from_raw(0x8a1fb46622dffff).expect("valid h3 cell"),
@@ -1171,7 +1180,7 @@ mod test {
                         coverage_points: dec!(4),
                         rank: Some(dec!(0.50)),
                         boost_multiplier: NonZeroU32::new(1).unwrap(),
-                        hex_assignments: HexAssignments::test_best(),
+                        hex_assignments: hex_assignments_mock(),
                     },
                     boosted_hex_info: BoostedHex {
                         location: Cell::from_raw(0x8a1fb46622dffff).expect("valid h3 cell"),
@@ -1185,7 +1194,7 @@ mod test {
                         coverage_points: dec!(4),
                         rank: Some(dec!(0.25)),
                         boost_multiplier: NonZeroU32::new(1).unwrap(),
-                        hex_assignments: HexAssignments::test_best(),
+                        hex_assignments: hex_assignments_mock(),
                     },
                     boosted_hex_info: BoostedHex {
                         location: Cell::from_raw(0x8a1fb46622dffff).expect("valid h3 cell"),
@@ -1456,7 +1465,7 @@ mod test {
             signal_power: 0,
             coverage_claim_time: coverage_claim_time.unwrap_or(DateTime::<Utc>::MIN_UTC),
             inserted_at: DateTime::<Utc>::MIN_UTC,
-            assignments: HexAssignments::test_best(),
+            assignments: hex_assignments_mock(),
         }
     }
 
@@ -1474,7 +1483,7 @@ mod test {
             signal_level: SignalLevel::High,
             coverage_claim_time,
             inserted_at: DateTime::<Utc>::MIN_UTC,
-            assignments: HexAssignments::test_best(),
+            assignments: hex_assignments_mock(),
         }
     }
 
@@ -1492,7 +1501,7 @@ mod test {
             signal_level: SignalLevel::High,
             coverage_claim_time,
             inserted_at: DateTime::<Utc>::MIN_UTC,
-            assignments: HexAssignments::test_best(),
+            assignments: hex_assignments_mock(),
         }
     }
 
@@ -1510,7 +1519,7 @@ mod test {
             signal_level,
             coverage_claim_time,
             inserted_at: DateTime::<Utc>::MIN_UTC,
-            assignments: HexAssignments::test_best(),
+            assignments: hex_assignments_mock(),
         }
     }
 }
diff --git a/mobile_verifier/src/reward_shares.rs b/mobile_verifier/src/reward_shares.rs
@@ -696,7 +696,7 @@ pub fn get_scheduled_tokens_for_oracles(duration: Duration) -> Decimal {
 #[cfg(test)]
 mod test {
     use super::*;
-    use hex_assignments::assignment::HexAssignments;
+    use hex_assignments::{assignment::HexAssignments, Assignment};
 
     use crate::{
         cell_type::CellType,
@@ -719,6 +719,14 @@ mod test {
     use std::collections::HashMap;
     use uuid::Uuid;
 
+    fn hex_assignments_mock() -> HexAssignments {
+        HexAssignments {
+            footfall: Assignment::A,
+            urbanized: Assignment::A,
+            landtype: Assignment::A,
+        }
+    }
+
     #[test]
     fn ensure_correct_conversion_of_bytes_to_bones() {
         assert_eq!(
@@ -1007,7 +1015,7 @@ mod test {
             signal_power: 0,
             coverage_claim_time: DateTime::<Utc>::MIN_UTC,
             inserted_at: DateTime::<Utc>::MIN_UTC,
-            assignments: HexAssignments::test_best(),
+            assignments: hex_assignments_mock(),
         }]
     }
 
@@ -1890,7 +1898,7 @@ mod test {
                             coverage_points: CoverageRewardPoints {
                                 boost_multiplier: NonZeroU32::new(1).unwrap(),
                                 coverage_points: dec!(10.0),
-                                hex_assignments: HexAssignments::test_best(),
+                                hex_assignments: hex_assignments_mock(),
                                 rank: None,
                             },
                             boosted_hex: BoostedHex {