From 4ba6d743dc6dc9da99d5f2680a2a0dd496a7edc5 Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Sat, 8 Jul 2023 19:11:26 -0600
Subject: [PATCH] update usages of deps

---
 mev-build-rs/src/mempool_builder.rs             | 5 +++--
 mev-build-rs/src/service.rs                     | 2 +-
 mev-rs/src/blinded_block_provider/api/client.rs | 3 ++-
 mev-rs/src/blinded_block_provider/api/server.rs | 2 +-
 mev-rs/src/proposer_scheduler.rs                | 4 +++-
 mev-rs/src/validator_registry.rs                | 4 +++-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/mev-build-rs/src/mempool_builder.rs b/mev-build-rs/src/mempool_builder.rs
index d20e7b90..b42dcdba 100644
--- a/mev-build-rs/src/mempool_builder.rs
+++ b/mev-build-rs/src/mempool_builder.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use beacon_api_client::{BeaconProposerRegistration, Client, ProposerDuty};
+use beacon_api_client::{mainnet::Client, BeaconProposerRegistration, ProposerDuty};
 use ethereum_consensus::{
     clock::{convert_timestamp_to_slot, get_current_unix_time_in_secs},
     crypto::SecretKey,
@@ -159,7 +159,8 @@ impl Builder {
             // TODO update method on Context
             .unwrap_or(self.context.min_genesis_time + self.context.genesis_delay);
         let slot =
-            convert_timestamp_to_slot(*timestamp, genesis_time, self.context.seconds_per_slot);
+            convert_timestamp_to_slot(*timestamp, genesis_time, self.context.seconds_per_slot)
+                .expect("after genesis");
         let coordinate = Coordinate { slot, parent_hash };
         let mut state = self.state.lock();
         tracing::trace!("at {coordinate:?}, inserting build job from engine API: {job:?}");
diff --git a/mev-build-rs/src/service.rs b/mev-build-rs/src/service.rs
index 41646908..02e960ea 100644
--- a/mev-build-rs/src/service.rs
+++ b/mev-build-rs/src/service.rs
@@ -98,7 +98,7 @@ impl Service {
         let block_provider = builder.clone();
         let engine_builder = builder.clone();
 
-        let current_epoch = clock.current_epoch();
+        let current_epoch = clock.current_epoch().expect("after genesis");
         builder.initialize(current_epoch).await;
 
         let clock = tokio::spawn(async move {
diff --git a/mev-rs/src/blinded_block_provider/api/client.rs b/mev-rs/src/blinded_block_provider/api/client.rs
index 1c22d807..06900d65 100644
--- a/mev-rs/src/blinded_block_provider/api/client.rs
+++ b/mev-rs/src/blinded_block_provider/api/client.rs
@@ -7,7 +7,8 @@ use crate::{
 };
 use axum::http::StatusCode;
 use beacon_api_client::{
-    api_error_or_ok, ApiResult, Client as BeaconApiClient, Error as ApiError, VersionedValue,
+    api_error_or_ok, mainnet::Client as BeaconApiClient, ApiResult, Error as ApiError,
+    VersionedValue,
 };
 
 /// A `Client` for a service implementing the Builder APIs.
diff --git a/mev-rs/src/blinded_block_provider/api/server.rs b/mev-rs/src/blinded_block_provider/api/server.rs
index 8e7af891..aa25cbf7 100644
--- a/mev-rs/src/blinded_block_provider/api/server.rs
+++ b/mev-rs/src/blinded_block_provider/api/server.rs
@@ -26,7 +26,7 @@ impl IntoResponse for Error {
     fn into_response(self) -> Response {
         let message = self.to_string();
         let code = StatusCode::BAD_REQUEST;
-        (code, Json(ApiError { code, message })).into_response()
+        (code, Json(ApiError::ErrorMessage { code, message })).into_response()
     }
 }
 
diff --git a/mev-rs/src/proposer_scheduler.rs b/mev-rs/src/proposer_scheduler.rs
index a0284d48..794b7e7a 100644
--- a/mev-rs/src/proposer_scheduler.rs
+++ b/mev-rs/src/proposer_scheduler.rs
@@ -1,4 +1,6 @@
-use beacon_api_client::{BeaconProposerRegistration, Client, Error as ApiError, ProposerDuty};
+use beacon_api_client::{
+    mainnet::Client, BeaconProposerRegistration, Error as ApiError, ProposerDuty,
+};
 use ethereum_consensus::primitives::{BlsPublicKey, Epoch, Slot};
 use parking_lot::Mutex;
 use std::collections::HashMap;
diff --git a/mev-rs/src/validator_registry.rs b/mev-rs/src/validator_registry.rs
index 414f8f1b..ff237c94 100644
--- a/mev-rs/src/validator_registry.rs
+++ b/mev-rs/src/validator_registry.rs
@@ -1,5 +1,7 @@
 use crate::{signing::verify_signed_builder_message, types::SignedValidatorRegistration};
-use beacon_api_client::{Client, Error as ApiError, StateId, ValidatorStatus, ValidatorSummary};
+use beacon_api_client::{
+    mainnet::Client, Error as ApiError, StateId, ValidatorStatus, ValidatorSummary,
+};
 use ethereum_consensus::{
     builder::ValidatorRegistration,
     primitives::{BlsPublicKey, ExecutionAddress, ValidatorIndex},