From 1a72256a90e2b521bcfcdcb0587141ad5e70136f Mon Sep 17 00:00:00 2001
From: Macpie <pierre@nova-labs.com>
Date: Thu, 5 Sep 2024 15:07:30 -0700
Subject: [PATCH] Fix rebase

---
 Cargo.lock                              | 4 ++--
 ingest/src/server_mobile.rs             | 7 +++++--
 mobile_verifier/src/promotion_reward.rs | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4eca1e7f1..b8f4ebc39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1617,7 +1617,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 [[package]]
 name = "beacon"
 version = "0.1.0"
-source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#3edfa450c620b47cb3da29f5e8e150e0f8454fc0"
+source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#72905c9a0b8893daf4da2fae6bdc9bbfc2f1a2a8"
 dependencies = [
  "base64 0.21.7",
  "byteorder",
@@ -3801,7 +3801,7 @@ dependencies = [
 [[package]]
 name = "helium-proto"
 version = "0.1.0"
-source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#3edfa450c620b47cb3da29f5e8e150e0f8454fc0"
+source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#72905c9a0b8893daf4da2fae6bdc9bbfc2f1a2a8"
 dependencies = [
  "bytes",
  "prost",
diff --git a/ingest/src/server_mobile.rs b/ingest/src/server_mobile.rs
index e288002cc..71bf2bf07 100644
--- a/ingest/src/server_mobile.rs
+++ b/ingest/src/server_mobile.rs
@@ -47,6 +47,7 @@ pub struct GrpcServer {
     sp_boosted_rewards_ban_sink:
         FileSinkClient<ServiceProviderBoostedRewardsBannedRadioIngestReportV1>,
     subscriber_mapping_event_sink: FileSinkClient<SubscriberVerifiedMappingEventIngestReportV1>,
+    promotion_reward_sink: FileSinkClient<PromotionRewardIngestReportV1>,
     required_network: Network,
     address: SocketAddr,
     api_token: MetadataValue<Ascii>,
@@ -86,6 +87,7 @@ impl GrpcServer {
             ServiceProviderBoostedRewardsBannedRadioIngestReportV1,
         >,
         subscriber_mapping_event_sink: FileSinkClient<SubscriberVerifiedMappingEventIngestReportV1>,
+        promotion_reward_sink: FileSinkClient<PromotionRewardIngestReportV1>,
         required_network: Network,
         address: SocketAddr,
         api_token: MetadataValue<Ascii>,
@@ -101,7 +103,7 @@ impl GrpcServer {
             coverage_object_report_sink,
             sp_boosted_rewards_ban_sink,
             subscriber_mapping_event_sink,
-            subscriber_referral_eligibility_sink,
+            promotion_reward_sink,
             required_network,
             address,
             api_token,
@@ -576,7 +578,8 @@ pub async fn grpc_server(settings: &Settings) -> Result<()> {
         PromotionRewardIngestReportV1::file_sink(
             store_base_path,
             file_upload.clone(),
-            Some(settings.roll_time),
+            FileSinkCommitStrategy::Automatic,
+            FileSinkRollTime::Duration(settings.roll_time),
             env!("CARGO_PKG_NAME"),
         )
         .await?;
diff --git a/mobile_verifier/src/promotion_reward.rs b/mobile_verifier/src/promotion_reward.rs
index 6f0fa259e..46c25eec3 100644
--- a/mobile_verifier/src/promotion_reward.rs
+++ b/mobile_verifier/src/promotion_reward.rs
@@ -5,7 +5,7 @@ use file_store::{
     file_source,
     file_upload::FileUpload,
     promotion_reward::{Entity, PromotionReward},
-    traits::{FileSinkWriteExt, TimestampEncode},
+    traits::{FileSinkCommitStrategy, FileSinkRollTime, FileSinkWriteExt, TimestampEncode},
     FileType,
 };
 use futures::{StreamExt, TryFutureExt, TryStreamExt};
@@ -63,7 +63,8 @@ impl PromotionRewardDaemon {
             VerifiedPromotionRewardV1::file_sink(
                 settings.store_base_path(),
                 file_upload.clone(),
-                Some(Duration::from_secs(15 * 60)),
+                FileSinkCommitStrategy::Automatic,
+                FileSinkRollTime::Duration(Duration::from_secs(15 * 60)),
                 env!("CARGO_PKG_NAME"),
             )
             .await?;