fix: module inception clippy issue

Makefile

@@ -6,7 +6,11 @@ build:
 
 .PHONY: fmt
 fmt:
-	@rustfmt --config-path ./.rustfmt.toml --check ./crates/rproxy/**/*
+	@cargo +nightly fmt --check
+
+.PHONY: lint
+lint:
+	@cargo +nightly clippy --all-features -- -D warnings
 
 .PHONY: help
 help:

crates/rproxy/src/config/config.rs → crates/rproxy/src/config.rs

@@ -3,21 +3,20 @@ use std::{process, sync::LazyLock};
 use clap::Parser;
 use thiserror::Error;
 
-use crate::config::{
-    ConfigAuthrpc,
-    ConfigAuthrpcError,
-    ConfigCircuitBreaker,
-    ConfigCircuitBreakerError,
-    ConfigFlashblocks,
-    ConfigFlashblocksError,
-    ConfigLogError,
-    ConfigLogging,
-    ConfigMetrics,
-    ConfigMetricsError,
-    ConfigRpc,
-    ConfigRpcError,
-    ConfigTls,
-    ConfigTlsError,
+use crate::server::{
+    config::{ConfigLoggingError, ConfigLogging, ConfigMetrics, ConfigMetricsError},
+    proxy::config::{
+        ConfigAuthrpc,
+        ConfigAuthrpcError,
+        ConfigCircuitBreaker,
+        ConfigCircuitBreakerError,
+        ConfigFlashblocks,
+        ConfigFlashblocksError,
+        ConfigRpc,
+        ConfigRpcError,
+        ConfigTls,
+        ConfigTlsError,
+    },
 };
 
 pub(crate) const ALREADY_VALIDATED: &str = "parameter must have been validated already";
@@ -76,10 +75,10 @@ impl Config {
         let mut errs: Vec<ConfigError> = vec![];
 
         // authrpc proxy
-        if self.rpc.enabled {
-            if let Some(_errs) = self.authrpc.validate() {
-                errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
-            }
+        if self.rpc.enabled &&
+            let Some(_errs) = self.authrpc.validate()
+        {
+            errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
         }
 
         // circuit-breaker
@@ -88,10 +87,10 @@ impl Config {
         }
 
         // flashblocks proxy
-        if self.flashblocks.enabled {
-            if let Some(_errs) = self.flashblocks.validate() {
-                errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
-            }
+        if self.flashblocks.enabled &&
+            let Some(_errs) = self.flashblocks.validate()
+        {
+            errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
         }
 
         // logging
@@ -105,17 +104,17 @@ impl Config {
         }
 
         // rpc proxy
-        if self.rpc.enabled {
-            if let Some(_errs) = self.rpc.validate() {
-                errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
-            }
+        if self.rpc.enabled &&
+            let Some(_errs) = self.rpc.validate()
+        {
+            errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
         }
 
         // tls
-        if self.tls.certificate != "" || self.tls.key != "" {
-            if let Some(_errs) = self.tls.validate() {
-                errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
-            }
+        if (!self.tls.certificate.is_empty() || !self.tls.key.is_empty()) &&
+            let Some(_errs) = self.tls.validate()
+        {
+            errs.append(&mut _errs.into_iter().map(|err| err.into()).collect());
         }
 
         if !self.authrpc.enabled && !self.flashblocks.enabled && !self.rpc.enabled {
@@ -148,7 +147,7 @@ pub(crate) enum ConfigError {
     ConfigFlashblocksInvalid(ConfigFlashblocksError),
 
     #[error("invalid logging configuration: {0}")]
-    ConfigLoggingInvalid(ConfigLogError),
+    ConfigLoggingInvalid(ConfigLoggingError),
 
     #[error("invalid metrics configuration: {0}")]
     ConfigMetricsInvalid(ConfigMetricsError),
@@ -181,8 +180,8 @@ impl From<ConfigFlashblocksError> for ConfigError {
     }
 }
 
-impl From<ConfigLogError> for ConfigError {
-    fn from(err: ConfigLogError) -> Self {
+impl From<ConfigLoggingError> for ConfigError {
+    fn from(err: ConfigLoggingError) -> Self {
         Self::ConfigLoggingInvalid(err)
     }
 }

crates/rproxy/src/jrpc/jrpc_error.rs

@@ -0,0 +1,9 @@
+use serde::Deserialize;
+
+// JrpcError -----------------------------------------------------------
+
+#[derive(Clone, Deserialize)]
+pub(crate) struct JrpcError {
+    // pub(crate) code: i64,
+    // pub(crate) message: String,
+}

crates/rproxy/src/jrpc/jrpc.rs → crates/rproxy/src/jrpc/jrpc_request.rs

@@ -1,14 +1,5 @@
-use std::borrow::Cow;
-
 use serde::Deserialize;
-
-// JrpcError -----------------------------------------------------------
-
-#[derive(Clone, Deserialize)]
-pub(crate) struct JrpcError {
-    // pub(crate) code: i64,
-    // pub(crate) message: String,
-}
+use std::borrow::Cow;
 
 // JrpcRequestMeta -----------------------------------------------------
 
@@ -91,10 +82,3 @@ impl JrpcRequestMetaMaybeBatch {
         }
     }
 }
-
-// JrpcResponseMeta ----------------------------------------------------
-
-#[derive(Clone, Deserialize)]
-pub(crate) struct JrpcResponseMeta {
-    pub(crate) error: Option<JrpcError>,
-}

crates/rproxy/src/jrpc/jrpc_response.rs

@@ -0,0 +1,10 @@
+use serde::Deserialize;
+
+use crate::jrpc::JrpcError;
+
+// JrpcResponseMeta ----------------------------------------------------
+
+#[derive(Clone, Deserialize)]
+pub(crate) struct JrpcResponseMeta {
+    pub(crate) error: Option<JrpcError>,
+}

crates/rproxy/src/jrpc/mod.rs

@@ -1,2 +1,8 @@
-mod jrpc;
-pub(crate) use jrpc::*;
+mod jrpc_error;
+pub(crate) use jrpc_error::*;
+
+mod jrpc_request;
+pub(crate) use jrpc_request::*;
+
+mod jrpc_response;
+pub(crate) use jrpc_response::*;

crates/rproxy/src/lib.rs

@@ -1,10 +1,5 @@
 pub mod config;
 pub mod server;
 
-mod circuit_breaker;
 mod jrpc;
-mod metrics;
-mod proxy;
-mod proxy_http;
-mod proxy_ws;
 mod utils;