fix unreachable_pub for discovery (#615)

* fix unreachable_pub for discovery

Author: noot

Cargo.toml

@@ -39,15 +39,15 @@ mockito = "1.7.0"
 iroh = "0.34.1"
 rand_v8 = { package = "rand", version = "0.8.5", features = ["std"] }
 rand_core_v6 = { package = "rand_core", version = "0.6.4", features = ["std"] }
+
 [workspace.package]
 version = "0.3.10"
 edition = "2021"
 
-[workspace.features]
-default = []
-testnet = []
-
 [workspace.lints.clippy]
 match_same_arms = "warn"
 unused_async = "warn"
 uninlined_format_args = "warn"
+
+[workspace.lints.rust]
+unreachable_pub = "warn"

crates/discovery/Cargo.toml

@@ -3,6 +3,9 @@ name = "discovery"
 version.workspace = true
 edition.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 actix-web = { workspace = true }
 alloy = { workspace = true }

crates/discovery/src/api/mod.rs

@@ -1,2 +1,2 @@
-pub mod routes;
-pub mod server;
+pub(crate) mod routes;
+pub(crate) mod server;

crates/discovery/src/api/routes/get_nodes.rs

@@ -8,7 +8,7 @@ use alloy::primitives::U256;
 use shared::models::api::ApiResponse;
 use shared::models::node::DiscoveryNode;
 
-pub async fn get_nodes(data: Data<AppState>) -> HttpResponse {
+pub(crate) async fn get_nodes(data: Data<AppState>) -> HttpResponse {
     let nodes = data.node_store.get_nodes().await;
     match nodes {
         Ok(nodes) => {
@@ -43,7 +43,7 @@ fn filter_nodes_for_pool(nodes: Vec<DiscoveryNode>, pool_id: u32) -> Vec<Discove
     filtered
 }
 
-pub async fn get_nodes_for_pool(
+pub(crate) async fn get_nodes_for_pool(
     data: Data<AppState>,
     pool_id: web::Path<String>,
     req: actix_web::HttpRequest,
@@ -123,7 +123,10 @@ pub async fn get_nodes_for_pool(
     }
 }
 
-pub async fn get_node_by_subkey(node_id: web::Path<String>, data: Data<AppState>) -> HttpResponse {
+pub(crate) async fn get_node_by_subkey(
+    node_id: web::Path<String>,
+    data: Data<AppState>,
+) -> HttpResponse {
     let node = data.node_store.get_node_by_id(&node_id.to_string()).await;
 
     match node {

crates/discovery/src/api/routes/mod.rs

@@ -1,2 +1,2 @@
-pub mod get_nodes;
-pub mod node;
+pub(crate) mod get_nodes;
+pub(crate) mod node;

crates/discovery/src/api/routes/node.rs

@@ -9,7 +9,7 @@ use shared::models::api::ApiResponse;
 use shared::models::node::{ComputeRequirements, Node};
 use std::str::FromStr;
 
-pub async fn register_node(
+pub(crate) async fn register_node(
     node: web::Json<Node>,
     data: Data<AppState>,
     req: actix_web::HttpRequest,
@@ -211,7 +211,7 @@ pub async fn register_node(
     }
 }
 
-pub fn node_routes() -> Scope {
+pub(crate) fn node_routes() -> Scope {
     web::scope("/api/nodes").route("", put().to(register_node))
 }
 

crates/discovery/src/api/server.rs

@@ -21,7 +21,7 @@ use std::time::{Duration, SystemTime};
 use tokio::sync::Mutex;
 
 #[derive(Clone)]
-pub struct AppState {
+pub(crate) struct AppState {
     pub node_store: Arc<NodeStore>,
     pub contracts: Option<Contracts<RootProvider>>,
     pub last_chain_sync: Arc<Mutex<Option<SystemTime>>>,

crates/discovery/src/lib.rs

@@ -1,5 +1,12 @@
-pub mod api;
-pub mod chainsync;
-pub mod location_enrichment;
-pub mod location_service;
-pub mod store;
+mod api;
+mod chainsync;
+mod location_enrichment;
+mod location_service;
+mod store;
+
+pub use api::server::start_server;
+pub use chainsync::ChainSync;
+pub use location_enrichment::LocationEnrichmentService;
+pub use location_service::LocationService;
+pub use store::node_store::NodeStore;
+pub use store::redis::RedisStore;

crates/discovery/src/main.rs

@@ -1,14 +1,3 @@
-mod api;
-mod chainsync;
-mod location_enrichment;
-mod location_service;
-mod store;
-use crate::api::server::start_server;
-use crate::chainsync::ChainSync;
-use crate::location_enrichment::LocationEnrichmentService;
-use crate::location_service::LocationService;
-use crate::store::node_store::NodeStore;
-use crate::store::redis::RedisStore;
 use alloy::providers::RootProvider;
 use anyhow::Result;
 use clap::Parser;
@@ -20,6 +9,10 @@ use std::time::Duration;
 use tokio::sync::Mutex;
 use tokio_util::sync::CancellationToken;
 
+use discovery::{
+    start_server, ChainSync, LocationEnrichmentService, LocationService, NodeStore, RedisStore,
+};
+
 #[derive(Debug, Clone, Copy, PartialEq)]
 enum ServiceMode {
     Api,

crates/discovery/src/store/mod.rs

@@ -1,2 +1,2 @@
-pub mod node_store;
-pub mod redis;
+pub(crate) mod node_store;
+pub(crate) mod redis;