diff --git a/crates/provider/src/ext/trace/trace.rs b/crates/provider/src/ext/trace/api.rs
similarity index 100%
rename from crates/provider/src/ext/trace/trace.rs
rename to crates/provider/src/ext/trace/api.rs
diff --git a/crates/provider/src/ext/trace/mod.rs b/crates/provider/src/ext/trace/mod.rs
index 4a3204ee9f8..0f20d99aaa3 100644
--- a/crates/provider/src/ext/trace/mod.rs
+++ b/crates/provider/src/ext/trace/mod.rs
@@ -1,5 +1,5 @@
-mod trace;
+mod api;
 mod with_block;
 
-pub use trace::*;
+pub use api::*;
 pub use with_block::*;
diff --git a/crates/provider/src/ext/trace/with_block.rs b/crates/provider/src/ext/trace/with_block.rs
index c889a197edd..7cb9ccc0af5 100644
--- a/crates/provider/src/ext/trace/with_block.rs
+++ b/crates/provider/src/ext/trace/with_block.rs
@@ -87,7 +87,7 @@ where
     }
 
     /// Get the trace types.
-    pub fn get_trace_types(&self) -> &HashSet<TraceType> {
+    pub const fn get_trace_types(&self) -> &HashSet<TraceType> {
         &self.trace_types
     }
 }
diff --git a/crates/provider/src/provider/with_block.rs b/crates/provider/src/provider/with_block.rs
index cfbbe1d6905..1e72183b09e 100644
--- a/crates/provider/src/provider/with_block.rs
+++ b/crates/provider/src/provider/with_block.rs
@@ -353,11 +353,11 @@ where
 {
     fn from(trace_rpc: TraceRpcWithBlock<T, Params, Resp, Output, Map>) -> Self {
         let rpc = trace_rpc.deref();
-        RpcWithBlock {
+        Self {
             client: rpc.client.clone(),
             method: rpc.method.clone(),
             params: rpc.params.clone(),
-            block_id: rpc.block_id.clone(),
+            block_id: rpc.block_id,
             trace_types: trace_rpc.get_trace_types().clone(),
             map: rpc.map,
             _pd: rpc._pd,