From 104981b7c22d6ed1f5a6bd6bc5116396f81fccc7 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Fri, 2 Aug 2024 12:55:15 -0700 Subject: [PATCH] fixup after rebase --- mobile_verifier/src/radio_threshold.rs | 4 +++- mobile_verifier/src/rewarder.rs | 4 +++- mobile_verifier/src/sp_boosted_rewards_bans.rs | 5 +++-- mobile_verifier/src/subscriber_location.rs | 3 ++- mobile_verifier/tests/integrations/rewarder_poc_dc.rs | 4 ++-- poc_entropy/src/main.rs | 5 +---- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mobile_verifier/src/radio_threshold.rs b/mobile_verifier/src/radio_threshold.rs index 483d878c4..c10453bff 100644 --- a/mobile_verifier/src/radio_threshold.rs +++ b/mobile_verifier/src/radio_threshold.rs @@ -11,7 +11,7 @@ use file_store::{ mobile_radio_threshold::{ RadioThresholdIngestReport, RadioThresholdReportReq, VerifiedRadioThresholdIngestReport, }, - traits::FileSinkWriteExt, + traits::{FileSinkWriteExt, DEFAULT_ROLL_TIME}, FileStore, FileType, }; use futures::{StreamExt, TryStreamExt}; @@ -73,6 +73,7 @@ where VerifiedRadioThresholdIngestReportV1::file_sink( settings.store_base_path(), file_upload.clone(), + Some(DEFAULT_ROLL_TIME), env!("CARGO_PKG_NAME"), ) .await?; @@ -81,6 +82,7 @@ where VerifiedInvalidatedRadioThresholdIngestReportV1::file_sink( settings.store_base_path(), file_upload.clone(), + Some(DEFAULT_ROLL_TIME), env!("CARGO_PKG_NAME"), ) .await?; diff --git a/mobile_verifier/src/rewarder.rs b/mobile_verifier/src/rewarder.rs index 9fa89da74..0562994e3 100644 --- a/mobile_verifier/src/rewarder.rs +++ b/mobile_verifier/src/rewarder.rs @@ -17,7 +17,7 @@ use db_store::meta; use file_store::{ file_sink::FileSinkClient, file_upload::FileUpload, - traits::{FileSinkWriteExt, TimestampEncode}, + traits::{FileSinkWriteExt, TimestampEncode, DEFAULT_ROLL_TIME}, }; use futures_util::TryFutureExt; @@ -81,6 +81,7 @@ where let (mobile_rewards, mobile_rewards_server) = MobileRewardShare::file_sink( settings.store_base_path(), file_upload.clone(), + Some(DEFAULT_ROLL_TIME), env!("CARGO_PKG_NAME"), ) .await?; @@ -88,6 +89,7 @@ where let (reward_manifests, reward_manifests_server) = RewardManifest::file_sink( settings.store_base_path(), file_upload, + Some(DEFAULT_ROLL_TIME), env!("CARGO_PKG_NAME"), ) .await?; diff --git a/mobile_verifier/src/sp_boosted_rewards_bans.rs b/mobile_verifier/src/sp_boosted_rewards_bans.rs index 074f60111..f073450ae 100644 --- a/mobile_verifier/src/sp_boosted_rewards_bans.rs +++ b/mobile_verifier/src/sp_boosted_rewards_bans.rs @@ -7,7 +7,7 @@ use file_store::{ }, file_sink::FileSinkClient, file_upload::FileUpload, - traits::FileSinkWriteExt, + traits::{FileSinkWriteExt, DEFAULT_ROLL_TIME}, FileStore, FileType, }; use futures::{prelude::future::LocalBoxFuture, StreamExt, TryFutureExt, TryStreamExt}; @@ -158,6 +158,7 @@ where VerifiedServiceProviderBoostedRewardsBannedRadioIngestReportV1::file_sink( settings.store_base_path(), file_upload, + Some(DEFAULT_ROLL_TIME), env!("CARGO_PKG_NAME"), ) .await?; @@ -332,7 +333,7 @@ pub mod db { let radio_key = row.get::("radio_key"); match radio_type { HbType::Wifi => set.insert_wifi(PublicKeyBinary::from_str(&radio_key)?), - HbType::Cbrs => set.insert_cbrs(radio_key.into()), + HbType::Cbrs => set.insert_cbrs(radio_key), }; Ok(set) diff --git a/mobile_verifier/src/subscriber_location.rs b/mobile_verifier/src/subscriber_location.rs index 55ed735d0..69a09a369 100644 --- a/mobile_verifier/src/subscriber_location.rs +++ b/mobile_verifier/src/subscriber_location.rs @@ -8,7 +8,7 @@ use file_store::{ SubscriberLocationIngestReport, SubscriberLocationReq, VerifiedSubscriberLocationIngestReport, }, - traits::FileSinkWriteExt, + traits::{FileSinkWriteExt, DEFAULT_ROLL_TIME}, FileStore, FileType, }; use futures::{StreamExt, TryStreamExt}; @@ -57,6 +57,7 @@ where VerifiedSubscriberLocationIngestReportV1::file_sink( settings.store_base_path(), file_upload.clone(), + Some(DEFAULT_ROLL_TIME), env!("CARGO_PKG_NAME"), ) .await?; diff --git a/mobile_verifier/tests/integrations/rewarder_poc_dc.rs b/mobile_verifier/tests/integrations/rewarder_poc_dc.rs index 58cf8d41a..1e3c112ce 100644 --- a/mobile_verifier/tests/integrations/rewarder_poc_dc.rs +++ b/mobile_verifier/tests/integrations/rewarder_poc_dc.rs @@ -7,7 +7,7 @@ use file_store::{ use helium_crypto::PublicKeyBinary; use helium_proto::services::poc_mobile::{ CoverageObjectValidity, GatewayReward, HeartbeatValidity, MobileRewardShare, RadioRewardV2, - SeniorityUpdateReason, SignalLevel, UnallocatedReward, UnallocatedRewardType, + SeniorityUpdateReason, SignalLevel, }; use mobile_verifier::{ cell_type::CellType, @@ -124,7 +124,7 @@ async fn test_poc_and_dc_rewards(pool: PgPool) -> anyhow::Result<()> { } async fn receive_expected_rewards( - mobile_rewards: &mut MockFileSinkReceiver, + mobile_rewards: &mut MockFileSinkReceiver, ) -> anyhow::Result<(Vec, Vec)> { // get the filestore outputs from rewards run diff --git a/poc_entropy/src/main.rs b/poc_entropy/src/main.rs index 761562562..e13253438 100644 --- a/poc_entropy/src/main.rs +++ b/poc_entropy/src/main.rs @@ -1,9 +1,6 @@ use anyhow::{Error, Result}; use clap::Parser; -use file_store::{ - file_upload, - traits::{FileSinkWriteExt, DEFAULT_ROLL_TIME}, -}; +use file_store::{file_upload, traits::FileSinkWriteExt}; use futures_util::TryFutureExt; use helium_proto::EntropyReportV1; use poc_entropy::{entropy_generator::EntropyGenerator, server::ApiServer, Settings};