re export all types

Author: realbigsean

builder-client/Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+builder-api-types = { path = "../builder-api-types" }
 ethereum-apis-common = { path = "../common" }
 reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-types.workspace = true

builder-client/src/lib.rs

@@ -1,11 +1,11 @@
+pub use builder_api_types::{
+    builder_bid::SignedBuilderBid, eth_spec::EthSpec, ExecutionBlockHash, ExecutionPayload,
+    PublicKeyBytes, SignedBlindedBeaconBlock, SignedValidatorRegistrationData, Slot,
+};
 use ethereum_apis_common::ErrorResponse;
 use reqwest::Client;
 use reqwest::Url;
 use serde::de::DeserializeOwned;
-use types::{
-    builder_bid::SignedBuilderBid, eth_spec::EthSpec, ExecutionBlockHash, ExecutionPayload,
-    PublicKeyBytes, SignedBlindedBeaconBlock, SignedValidatorRegistrationData, Slot,
-};
 
 #[derive(Debug)]
 pub enum Error {

builder-server/Cargo.toml

@@ -17,4 +17,3 @@ serde.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
 tracing.workspace = true
-types.workspace = true

builder-server/src/builder.rs

@@ -1,9 +1,9 @@
 use async_trait::async_trait;
-use ethereum_apis_common::ErrorResponse;
-use types::{
+use builder_api_types::{
     builder_bid::SignedBuilderBid, eth_spec::EthSpec, ExecutionBlockHash, ExecutionPayload,
     ForkName, PublicKeyBytes, SignedBlindedBeaconBlock, SignedValidatorRegistrationData, Slot,
 };
+use ethereum_apis_common::ErrorResponse;
 
 #[async_trait]
 pub trait Builder<E: EthSpec> {

builder-server/src/server.rs

@@ -6,12 +6,12 @@ use axum::{
     routing::{get, post},
     Json, Router,
 };
-use ethereum_apis_common::build_response;
-use types::{
+use builder_api_types::{
     eth_spec::EthSpec, fork_versioned_response::EmptyMetadata, ExecutionBlockHash,
     ForkVersionedResponse, PublicKeyBytes, SignedBlindedBeaconBlock,
     SignedValidatorRegistrationData, Slot,
 };
+use ethereum_apis_common::build_response;
 
 use crate::builder::Builder;
 

common/Cargo.toml

@@ -15,4 +15,4 @@ serde.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
 tracing.workspace = true
-types.workspace = true
+beacon-api-types = { path = "../beacon-api-types" }

common/src/lib.rs

@@ -4,14 +4,14 @@ use axum::{
     extract::{FromRequest, Request},
     response::{IntoResponse, Response},
 };
+use beacon_api_types::ForkVersionDeserialize;
 use bytes::Bytes;
 use flate2::read::GzDecoder;
 use http::header::CONTENT_ENCODING;
 use http::{header::CONTENT_TYPE, HeaderValue, StatusCode};
 use serde::{Deserialize, Serialize};
 use std::io::Read;
 use tracing::error;
-use types::ForkVersionDeserialize;
 
 pub const CONSENSUS_VERSION_HEADER: &'static str = "Eth-Consensus-Version";
 

relay-api-types/Cargo.toml

@@ -10,4 +10,3 @@ ethereum_ssz.workspace = true
 ethereum_ssz_derive.workspace = true
 serde.workspace = true
 superstruct.workspace = true
-types.workspace = true

relay-api-types/src/lib.rs

@@ -1,14 +1,13 @@
-use beacon_api_types::BlobsBundle;
-use serde::{Deserialize, Serialize};
-use serde_utils::quoted_u64::Quoted;
-use ssz_derive::{Decode, Encode};
-pub use types::{
-    superstruct, Address, EthSpec, ExecutionBlockHash, ExecutionPayloadBellatrix,
+pub use beacon_api_types::{
+    superstruct, Address, BlobsBundle, EthSpec, ExecutionBlockHash, ExecutionPayloadBellatrix,
     ExecutionPayloadCapella, ExecutionPayloadDeneb, ExecutionPayloadElectra,
     ExecutionPayloadHeaderBellatrix, ExecutionPayloadHeaderCapella, ExecutionPayloadHeaderDeneb,
     ExecutionPayloadHeaderElectra, MainnetEthSpec, MinimalEthSpec, PublicKeyBytes, Signature,
     SignedValidatorRegistrationData, Slot, Uint256,
 };
+use serde::{Deserialize, Serialize};
+use serde_utils::quoted_u64::Quoted;
+use ssz_derive::{Decode, Encode};
 
 // Builder API requests
 

relay-client/Cargo.toml

@@ -12,4 +12,3 @@ reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 tokio-tungstenite.workspace = true
-types.workspace = true