Merge branch 'main' into ceyhun/bridge_backend_support

Author: ceyhunsen

Cargo.toml

@@ -19,14 +19,7 @@ tempfile = "3.8"
 tokio = { version = "1.39", features = ["full"] }
 toml = "0.8.0"
 which = "6.0.1"
-
-# Eth client dependencies
-alloy = { version = "0.2.1", features = ["hyper", "rpc-types-eth", "provider-http", "signers", "signer-local"] }
 jsonrpsee = { version = "0.24.2", features = ["http-client", "ws-client"] }
-reqwest = { version = "=0.12.5", features = ["rustls-tls", "json", "http2"], default-features = false }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
-reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false }
-reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "a206eb3690e5a51d3c797fed2a6ed722e36863eb", default-features = false, features = ["jsonrpsee-types"] }
 
 # Citrea dependencies
 bitcoin-da = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", features = ["native"] }

src/bitcoin.rs

@@ -21,7 +21,7 @@ use super::{
     config::BitcoinConfig,
     docker::DockerEnv,
     framework::TestContext,
-    traits::{LogProvider, Node, Restart, SpawnOutput},
+    traits::{LogProvider, NodeT, Restart, SpawnOutput},
     Result,
 };
 use crate::node::NodeKind;
@@ -148,7 +148,7 @@ impl BitcoinNode {
     async fn spawn(config: &BitcoinConfig, docker: &Arc<Option<DockerEnv>>) -> Result<SpawnOutput> {
         match docker.as_ref() {
             Some(docker) => docker.spawn(config.into()).await,
-            None => <Self as Node>::spawn(config),
+            None => <Self as NodeT>::spawn(config),
         }
     }
 }
@@ -186,7 +186,7 @@ impl RpcApi for BitcoinNode {
 }
 
 #[async_trait]
-impl Node for BitcoinNode {
+impl NodeT for BitcoinNode {
     type Config = BitcoinConfig;
     type Client = Client;
 
@@ -234,6 +234,10 @@ impl Node for BitcoinNode {
     fn config_mut(&mut self) -> &mut Self::Config {
         &mut self.config
     }
+
+    fn config(&self) -> &Self::Config {
+        &self.config
+    }
 }
 
 #[async_trait]