From 90480d17f5daa8a5330b91c2624c4d875f0be800 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Mon, 6 May 2024 11:29:38 -0700 Subject: [PATCH] fixup after rebase - remove unused imports - remove old refactor return types --- .../tests/integrations/watcher_tests.rs | 5 +---- mobile_config/src/boosted_hex_info.rs | 16 ---------------- .../tests/integrations/hex_boosting.rs | 5 +---- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/boost_manager/tests/integrations/watcher_tests.rs b/boost_manager/tests/integrations/watcher_tests.rs index 78d180eca..a403efab7 100644 --- a/boost_manager/tests/integrations/watcher_tests.rs +++ b/boost_manager/tests/integrations/watcher_tests.rs @@ -2,10 +2,7 @@ use crate::common::{self, MockFileSinkReceiver, MockHexBoostingClient}; use boost_manager::watcher::{self, Watcher}; use chrono::{Duration as ChronoDuration, Duration, Utc}; use helium_proto::BoostedHexInfoV1 as BoostedHexInfoProto; -use mobile_config::{ - boosted_hex_info::{BoostedHexDeviceType, BoostedHexInfo, BoostedHexInfoStream}, - client::{hex_boosting_client::HexBoostingInfoResolver, ClientError}, -}; +use mobile_config::boosted_hex_info::{BoostedHexDeviceType, BoostedHexInfo}; use solana_sdk::pubkey::Pubkey; use sqlx::PgPool; use std::{num::NonZeroU32, str::FromStr}; diff --git a/mobile_config/src/boosted_hex_info.rs b/mobile_config/src/boosted_hex_info.rs index a338472b7..a00948383 100644 --- a/mobile_config/src/boosted_hex_info.rs +++ b/mobile_config/src/boosted_hex_info.rs @@ -285,22 +285,6 @@ impl BoostedHexes { self.hexes.entry(info.location).or_default().push(info); } - - pub fn count(&self) -> usize { - self.hexes.len() - } - - pub fn iter_hexes(&self) -> impl Iterator { - self.hexes.values() - } - - pub fn get(&self, location: &Cell) -> Option<&BoostedHexInfo> { - self.hexes.get(location) - } - - pub fn insert(&mut self, info: BoostedHexInfo) { - self.hexes.insert(info.location, info); - } } pub(crate) mod db { diff --git a/mobile_verifier/tests/integrations/hex_boosting.rs b/mobile_verifier/tests/integrations/hex_boosting.rs index 856a14bd9..3ec1d584e 100644 --- a/mobile_verifier/tests/integrations/hex_boosting.rs +++ b/mobile_verifier/tests/integrations/hex_boosting.rs @@ -11,10 +11,7 @@ use helium_proto::services::poc_mobile::{ UnallocatedReward, }; use hextree::Cell; -use mobile_config::{ - boosted_hex_info::{BoostedHexDeviceType, BoostedHexInfo, BoostedHexInfoStream}, - client::{hex_boosting_client::HexBoostingInfoResolver, ClientError}, -}; +use mobile_config::boosted_hex_info::{BoostedHexDeviceType, BoostedHexInfo}; use mobile_verifier::{ cell_type::CellType, coverage::{set_oracle_boosting_assignments, CoverageObject, UnassignedHex},