Remove need for settings file to dump file (#919)

helium · Dec 17, 2024 · 4f21e29 · 4f21e29
1 parent 6a8bb9b
commit 4f21e29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/file_store/src/cli/dump.rs b/file_store/src/cli/dump.rs
@@ -13,7 +13,7 @@ use crate::{
     unique_connections::UniqueConnectionReq,
     usage_counts::{HexUsageCountsIngestReport, RadioUsageCountsIngestReport},
     wifi_heartbeat::WifiHeartbeatIngestReport,
-    FileType, Result, Settings,
+    FileType, Result,
 };
 use base64::Engine;
 use csv::Writer;
@@ -54,7 +54,7 @@ pub struct Cmd {
 }
 
 impl Cmd {
-    pub async fn run(&self, _settings: &Settings) -> Result {
+    pub async fn run(&self) -> Result {
         let mut file_stream = file_source::source([&self.in_path]);
 
         let mut wtr = Writer::from_writer(io::stdout());
@@ -301,6 +301,7 @@ impl Cmd {
                         "written_files": manifest.written_files,
                         "start_timestamp": manifest.start_timestamp,
                         "end_timestamp": manifest.end_timestamp,
+                        "reward_data": manifest.reward_data.unwrap()
                     }))?;
                 }
                 FileType::SignedPocReceiptTxn => {

diff --git a/file_store/src/main.rs b/file_store/src/main.rs
@@ -19,7 +19,7 @@ pub struct Cli {
 
 impl Cli {
     pub async fn run(self) -> Result {
-        let settings = Settings::new(&self.config)?;
+        let settings = Settings::new(&self.config);
         self.cmd.run(settings).await
     }
 }
@@ -33,12 +33,12 @@ pub enum Cmd {
 }
 
 impl Cmd {
-    pub async fn run(&self, settings: Settings) -> Result {
+    pub async fn run(&self, settings: Result<Settings>) -> Result {
         match self {
-            Cmd::Info(cmd) => cmd.run(&settings).await,
-            Cmd::Dump(cmd) => cmd.run(&settings).await,
-            Cmd::Bucket(cmd) => cmd.run(&settings).await,
-            Cmd::DumpMobileRewards(cmd) => cmd.run(&settings).await,
+            Cmd::Info(cmd) => cmd.run(&settings?).await,
+            Cmd::Dump(cmd) => cmd.run().await,
+            Cmd::Bucket(cmd) => cmd.run(&settings?).await,
+            Cmd::DumpMobileRewards(cmd) => cmd.run(&settings?).await,
         }
     }
 }