From 2cbefffbcb240bb6c5676a5d24e7a0931a8626f2 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Tue, 11 Feb 2025 17:51:37 -0800
Subject: [PATCH 1/2] make fortuna a lib

---
 apps/fortuna/Cargo.toml         | 4 ++++
 apps/fortuna/src/chain.rs       | 4 ++--
 apps/fortuna/src/command/run.rs | 2 +-
 apps/fortuna/src/lib.rs         | 7 +++++++
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 apps/fortuna/src/lib.rs

diff --git a/apps/fortuna/Cargo.toml b/apps/fortuna/Cargo.toml
index 96d4104339..2b00121ba8 100644
--- a/apps/fortuna/Cargo.toml
+++ b/apps/fortuna/Cargo.toml
@@ -3,6 +3,10 @@ name = "fortuna"
 version = "7.4.1"
 edition = "2021"
 
+[lib]
+name = "fortuna"
+path = "src/lib.rs"
+
 [dependencies]
 anyhow = "1.0.75"
 axum = { version = "0.6.20", features = ["json", "ws", "macros"] }
diff --git a/apps/fortuna/src/chain.rs b/apps/fortuna/src/chain.rs
index 21680a6a0b..34724c3b76 100644
--- a/apps/fortuna/src/chain.rs
+++ b/apps/fortuna/src/chain.rs
@@ -1,2 +1,2 @@
-pub(crate) mod ethereum;
-pub(crate) mod reader;
+pub mod ethereum;
+pub mod reader;
diff --git a/apps/fortuna/src/command/run.rs b/apps/fortuna/src/command/run.rs
index 6efec816d2..128447b6b0 100644
--- a/apps/fortuna/src/command/run.rs
+++ b/apps/fortuna/src/command/run.rs
@@ -101,7 +101,7 @@ pub async fn run_keeper(
     rpc_metrics: Arc<RpcMetrics>,
 ) -> Result<()> {
     let mut handles = Vec::new();
-    let keeper_metrics = Arc::new({
+    let keeper_metrics: Arc<KeeperMetrics> = Arc::new({
         let chain_labels: Vec<(String, Address)> = chains
             .iter()
             .map(|(id, state)| (id.clone(), state.provider_address))
diff --git a/apps/fortuna/src/lib.rs b/apps/fortuna/src/lib.rs
new file mode 100644
index 0000000000..7bc6f8566b
--- /dev/null
+++ b/apps/fortuna/src/lib.rs
@@ -0,0 +1,7 @@
+pub mod api;
+pub mod chain;
+pub mod command;
+pub mod config;
+pub mod eth_utils;
+pub mod keeper;
+pub mod state;

From 194ce99705fe11ad364e2625765556069e29bd0d Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Tue, 11 Feb 2025 17:55:55 -0800
Subject: [PATCH 2/2] refactor(fortuna): streamline module imports in main.rs

---
 apps/fortuna/src/main.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/apps/fortuna/src/main.rs b/apps/fortuna/src/main.rs
index de72834a1c..453a397bf6 100644
--- a/apps/fortuna/src/main.rs
+++ b/apps/fortuna/src/main.rs
@@ -1,14 +1,11 @@
 #![allow(clippy::just_underscores_and_digits)]
 
-use {anyhow::Result, clap::Parser, std::io::IsTerminal};
-
-pub mod api;
-pub mod chain;
-pub mod command;
-pub mod config;
-pub mod eth_utils;
-pub mod keeper;
-pub mod state;
+use {
+    anyhow::Result,
+    clap::Parser,
+    fortuna::{command, config},
+    std::io::IsTerminal,
+};
 
 // Server TODO list:
 // - Tests