chore: solve conflicts

chainbound · Sep 18, 2024 · dd182a5 · dd182a5
1 parent 7315af1
commit dd182a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/bolt-sidecar/src/client/constraints_client.rs b/bolt-sidecar/src/client/constraints_client.rs
@@ -229,7 +229,7 @@ impl ConstraintsApi for ConstraintsClient {
 mod tests {
     use reqwest::Url;
 
-    use crate::ConstraintsClient;
+    use super::ConstraintsClient;
 
     #[test]
     fn test_join_endpoints() {

diff --git a/bolt-sidecar/src/driver.rs b/bolt-sidecar/src/driver.rs
@@ -24,7 +24,7 @@ use crate::{
     start_builder_proxy_server,
     state::{fetcher::StateFetcher, ConsensusState, ExecutionState, HeadTracker, StateClient},
     telemetry::ApiMetrics,
-    BuilderProxyConfig, CommitBoostSigner, Config, ConstraintsApi, LocalBuilder, MevBoostClient,
+    BuilderProxyConfig, CommitBoostSigner, Config, ConstraintsApi, ConstraintsClient, LocalBuilder,
 };
 
 /// The driver for the sidecar, responsible for managing the main event loop.

diff --git a/bolt-sidecar/src/lib.rs b/bolt-sidecar/src/lib.rs
@@ -13,7 +13,8 @@ pub use api::{
 
 mod client;
 pub use client::{
-    commit_boost::CommitBoostSigner, mevboost::MevBoostClient, rpc::RpcClient, BeaconClient,
+    commit_boost::CommitBoostSigner, constraints_client::ConstraintsClient, rpc::RpcClient,
+    BeaconClient,
 };
 
 /// Telemetry and metrics utilities