From 9e729c7a5bd8f72459ff59ad69016bb9eb2feeda Mon Sep 17 00:00:00 2001
From: Andrew McKenzie <andrewb.mckenzie@gmail.com>
Date: Mon, 16 Dec 2024 16:28:38 +0000
Subject: [PATCH] tidy up

---
 file_store/src/cli/dump.rs                  | 2 +-
 iot_config/src/client/mod.rs                | 5 ++---
 iot_config/src/sub_dao_epoch_reward_info.rs | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/file_store/src/cli/dump.rs b/file_store/src/cli/dump.rs
index b6fbef0d3..69e246e13 100644
--- a/file_store/src/cli/dump.rs
+++ b/file_store/src/cli/dump.rs
@@ -1,4 +1,3 @@
-use crate::reward_manifest::RewardManifest;
 use crate::{
     cli::print_json,
     coverage::CoverageObject,
@@ -9,6 +8,7 @@ use crate::{
     mobile_radio_threshold::VerifiedRadioThresholdIngestReport,
     mobile_session::{DataTransferSessionIngestReport, InvalidDataTransferIngestReport},
     mobile_subscriber::{SubscriberLocationIngestReport, VerifiedSubscriberLocationIngestReport},
+    reward_manifest::RewardManifest,
     speedtest::{CellSpeedtest, CellSpeedtestIngestReport},
     traits::{MsgDecode, TimestampDecode},
     unique_connections::UniqueConnectionReq,
diff --git a/iot_config/src/client/mod.rs b/iot_config/src/client/mod.rs
index 18ef8133d..e81425b89 100644
--- a/iot_config/src/client/mod.rs
+++ b/iot_config/src/client/mod.rs
@@ -26,9 +26,7 @@ pub enum ClientError {
     #[error("error resolving region params: {0}")]
     UndefinedRegionParams(String),
     #[error("Invalid SubDaoRewardInfo proto response {0}")]
-    InvalidSubDaoRewardInfoProto(
-        #[from] crate::sub_dao_epoch_reward_info::SubDaoRewardInfoParseError,
-    ),
+    InvalidSubDaoRewardInfoProto(#[from] SubDaoRewardInfoParseError),
 }
 
 #[async_trait::async_trait]
@@ -82,6 +80,7 @@ macro_rules! call_with_retry {
     }};
 }
 
+use crate::sub_dao_epoch_reward_info::SubDaoRewardInfoParseError;
 pub(crate) use call_with_retry;
 
 impl Client {
diff --git a/iot_config/src/sub_dao_epoch_reward_info.rs b/iot_config/src/sub_dao_epoch_reward_info.rs
index 7fb11df38..63be49168 100644
--- a/iot_config/src/sub_dao_epoch_reward_info.rs
+++ b/iot_config/src/sub_dao_epoch_reward_info.rs
@@ -69,8 +69,6 @@ pub(crate) mod db {
     use sqlx::postgres::PgRow;
     use sqlx::{FromRow, PgExecutor, Row};
 
-    //TODO: fix rewards_issued in the query below, currently that column is not present in the table
-    //      using delegation_rewards_issued as a placeholder for now
     const GET_EPOCH_REWARD_INFO_SQL: &str = r#"
             SELECT
                 address AS epoch_address,