Merge pull request #69 from ralexstokes/refactor-crate-names

reserve `mev-rs` for the "common" crate and rename binary
ralexstokes · Jan 31, 2023 · 4e6a6e4 · 4e6a6e4
2 parents b6cc136 + adf868d
commit 4e6a6e4
Show file tree

Hide file tree

Showing 33 changed files with 48 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,12 @@
 [workspace]
 members = [
-    "bin/mev-rs",
+    "bin/mev",
     "mev-boost-rs",
     "mev-relay-rs",
     "mev-build-rs",
-    "mev-lib",
+    "mev-rs",
 ]
-default-members = ["bin/mev-rs"]
+default-members = ["bin/mev"]
 
 [patch."https://github.com/ralexstokes/ethereum-consensus"]
 ethereum-consensus = { git = "https://github.com/ralexstokes//ethereum-consensus", rev = "5531c285fc4030e265b8499612946d8a704e2c57" }

diff --git a/bin/mev-rs/Cargo.toml → bin/mev/Cargo.toml b/bin/mev-rs/Cargo.toml → bin/mev/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mev-rs"
+name = "mev"
 version = "0.2.1"
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -14,7 +14,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 mev-boost-rs = { path = "../../mev-boost-rs" }
 mev-relay-rs = { path = "../../mev-relay-rs" }
 mev-build-rs = { path = "../../mev-build-rs" }
-mev-lib = { path = "../../mev-lib" }
+mev-rs = { path = "../../mev-rs" }
 
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.5.9"

diff --git a/bin/mev-rs/LICENSE-APACHE → bin/mev/LICENSE-APACHE b/bin/mev-rs/LICENSE-APACHE → bin/mev/LICENSE-APACHE
diff --git a/bin/mev-rs/LICENSE-MIT → bin/mev/LICENSE-MIT b/bin/mev-rs/LICENSE-MIT → bin/mev/LICENSE-MIT
diff --git a/bin/mev-rs/src/cmd/boost.rs → bin/mev/src/cmd/boost.rs b/bin/mev-rs/src/cmd/boost.rs → bin/mev/src/cmd/boost.rs
@@ -2,7 +2,7 @@ use crate::cmd::config::Config;
 use anyhow::{anyhow, Result};
 use clap::Args;
 use mev_boost_rs::Service;
-use mev_lib::Network;
+use mev_rs::Network;
 
 #[derive(Debug, Args)]
 #[clap(about = "🚀 connecting proposers to the external builder network")]

diff --git a/bin/mev-rs/src/cmd/config.rs → bin/mev/src/cmd/config.rs b/bin/mev-rs/src/cmd/config.rs → bin/mev/src/cmd/config.rs
@@ -1,8 +1,8 @@
 use anyhow::{Context, Result};
 use clap::Args;
 use mev_boost_rs::Config as BoostConfig;
-use mev_lib::Network;
 use mev_relay_rs::Config as RelayConfig;
+use mev_rs::Network;
 use serde::Deserialize;
 use std::{fmt, path::Path};
 

diff --git a/bin/mev-rs/src/cmd/mod.rs → bin/mev/src/cmd/mod.rs b/bin/mev-rs/src/cmd/mod.rs → bin/mev/src/cmd/mod.rs
diff --git a/bin/mev-rs/src/cmd/relay.rs → bin/mev/src/cmd/relay.rs b/bin/mev-rs/src/cmd/relay.rs → bin/mev/src/cmd/relay.rs
@@ -1,8 +1,8 @@
 use crate::cmd::config::Config;
 use anyhow::{anyhow, Result};
 use clap::{Args, Subcommand};
-use mev_lib::Network;
 use mev_relay_rs::Service;
+use mev_rs::Network;
 
 #[derive(Debug, Args)]
 #[clap(about = "🏗 connecting builders to proposers", subcommand_negates_reqs = true)]

diff --git a/bin/mev-rs/src/main.rs → bin/mev/src/main.rs b/bin/mev-rs/src/main.rs → bin/mev/src/main.rs
@@ -16,7 +16,7 @@ pub enum NetworkArg {
 
 // NOTE: define this mapping so only this crate needs the `clap` dependency while still being able
 // to use the `clap::ValueEnum` machinery
-impl From<NetworkArg> for mev_lib::Network {
+impl From<NetworkArg> for mev_rs::Network {
     fn from(arg: NetworkArg) -> Self {
         match arg {
             NetworkArg::Mainnet => Self::Mainnet,
@@ -27,7 +27,7 @@ impl From<NetworkArg> for mev_lib::Network {
 }
 
 #[derive(Debug, Parser)]
-#[clap(author, version, name = "mev", about = "utilities for block space", long_about = None)]
+#[clap(author, version, about = "utilities for block space", long_about = None)]
 struct Cli {
     #[clap(long, default_value_t, value_enum)]
     network: NetworkArg,

diff --git a/mev-boost-rs/Cargo.toml b/mev-boost-rs/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.1"
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }
 beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client" }
 
-mev-lib = { path = "../mev-lib" }
+mev-rs = { path = "../mev-rs" }
 
 [dev-dependencies]
 rand = "0.8.5"

diff --git a/mev-boost-rs/src/relay_mux.rs b/mev-boost-rs/src/relay_mux.rs
@@ -4,7 +4,7 @@ use ethereum_consensus::{
     state_transition::{Context, Error as ConsensusError},
 };
 use futures::{stream, StreamExt};
-use mev_lib::{
+use mev_rs::{
     BidRequest, BlindedBlockProvider, BlindedBlockProviderClient as Relay,
     BlindedBlockProviderError, ExecutionPayload, SignedBlindedBeaconBlock, SignedBuilderBid,
     SignedValidatorRegistration,

diff --git a/mev-boost-rs/src/service.rs b/mev-boost-rs/src/service.rs
@@ -5,7 +5,7 @@ use ethereum_consensus::{
     state_transition::Context,
 };
 use futures::StreamExt;
-use mev_lib::{BlindedBlockProviderClient as Relay, BlindedBlockProviderServer, Network};
+use mev_rs::{BlindedBlockProviderClient as Relay, BlindedBlockProviderServer, Network};
 use serde::Deserialize;
 use std::{future::Future, net::Ipv4Addr, pin::Pin, task::Poll};
 use tokio::task::{JoinError, JoinHandle};

diff --git a/mev-boost-rs/tests/integration.rs b/mev-boost-rs/tests/integration.rs
@@ -10,11 +10,11 @@ use ethereum_consensus::{
 };
 use httpmock::prelude::*;
 use mev_boost_rs::{Config, Service};
-use mev_lib::{
+use mev_relay_rs::{Config as RelayConfig, Service as Relay};
+use mev_rs::{
     sign_builder_message, BidRequest, BlindedBlockProviderClient as RelayClient, ExecutionPayload,
     SignedBlindedBeaconBlock, SignedBuilderBid,
 };
-use mev_relay_rs::{Config as RelayConfig, Service as Relay};
 
 use rand::seq::SliceRandom;
 use std::{

diff --git a/mev-build-rs/Cargo.toml b/mev-build-rs/Cargo.toml
@@ -11,4 +11,4 @@ parking_lot = "0.12.1"
 
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }
 
-mev-lib = { path = "../mev-lib" }
+mev-rs = { path = "../mev-rs" }
diff --git a/mev-build-rs/src/engine_builder.rs b/mev-build-rs/src/engine_builder.rs
@@ -6,7 +6,7 @@ use ethereum_consensus::{
     ssz::ByteList,
     state_transition::Context,
 };
-use mev_lib::{
+use mev_rs::{
     blinded_block_provider::Error as BlindedBlockProviderError,
     types::{BidRequest as PayloadRequest, ExecutionPayload},
 };

diff --git a/mev-relay-rs/Cargo.toml b/mev-relay-rs/Cargo.toml
@@ -22,5 +22,5 @@ serde = { version = "1.0", features = ["derive"] }
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }
 beacon-api-client = { git = "https://github.com/ralexstokes/beacon-api-client" }
 
-mev-lib = { path = "../mev-lib" }
+mev-rs = { path = "../mev-rs" }
 mev-build-rs = { path = "../mev-build-rs" }
diff --git a/mev-relay-rs/src/relay.rs b/mev-relay-rs/src/relay.rs
@@ -11,7 +11,7 @@ use ethereum_consensus::{
     state_transition::{Context, Error as ConsensusError},
 };
 use mev_build_rs::EngineBuilder;
-use mev_lib::{
+use mev_rs::{
     sign_builder_message, types::bellatrix as spec, verify_signed_builder_message, BidRequest,
     BlindedBlockProvider, BlindedBlockProviderError, ExecutionPayload, ExecutionPayloadHeader,
     SignedBlindedBeaconBlock, SignedBuilderBid, SignedValidatorRegistration,

diff --git a/mev-relay-rs/src/service.rs b/mev-relay-rs/src/service.rs
@@ -6,7 +6,7 @@ use ethereum_consensus::{
 };
 use futures::StreamExt;
 use mev_build_rs::EngineBuilder;
-use mev_lib::{BlindedBlockProviderServer, Network};
+use mev_rs::{BlindedBlockProviderServer, Network};
 use serde::Deserialize;
 use std::{future::Future, net::Ipv4Addr, pin::Pin, sync::Arc, task::Poll};
 use tokio::task::{JoinError, JoinHandle};

diff --git a/mev-lib/Cargo.toml → mev-rs/Cargo.toml b/mev-lib/Cargo.toml → mev-rs/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mev-lib"
+name = "mev-rs"
 version = "0.2.1"
 edition = "2021"
 license = "MIT OR Apache-2.0"

diff --git a/mev-lib/LICENSE-APACHE → mev-rs/LICENSE-APACHE b/mev-lib/LICENSE-APACHE → mev-rs/LICENSE-APACHE
diff --git a/mev-lib/LICENSE-MIT → mev-rs/LICENSE-MIT b/mev-lib/LICENSE-MIT → mev-rs/LICENSE-MIT
diff --git a/.../src/blinded_block_provider/api/client.rs → .../src/blinded_block_provider/api/client.rs b/.../src/blinded_block_provider/api/client.rs → .../src/blinded_block_provider/api/client.rs
diff --git a/...lib/src/blinded_block_provider/api/mod.rs → mev-rs/src/blinded_block_provider/api/mod.rs b/...lib/src/blinded_block_provider/api/mod.rs → mev-rs/src/blinded_block_provider/api/mod.rs
diff --git a/.../src/blinded_block_provider/api/server.rs → .../src/blinded_block_provider/api/server.rs b/.../src/blinded_block_provider/api/server.rs → .../src/blinded_block_provider/api/server.rs
diff --git a/mev-lib/src/blinded_block_provider/mod.rs → mev-rs/src/blinded_block_provider/mod.rs b/mev-lib/src/blinded_block_provider/mod.rs → mev-rs/src/blinded_block_provider/mod.rs
diff --git a/mev-lib/src/lib.rs → mev-rs/src/lib.rs b/mev-lib/src/lib.rs → mev-rs/src/lib.rs
diff --git a/mev-lib/src/network.rs → mev-rs/src/network.rs b/mev-lib/src/network.rs → mev-rs/src/network.rs
diff --git a/mev-lib/src/serde.rs → mev-rs/src/serde.rs b/mev-lib/src/serde.rs → mev-rs/src/serde.rs
diff --git a/mev-lib/src/signing.rs → mev-rs/src/signing.rs b/mev-lib/src/signing.rs → mev-rs/src/signing.rs
diff --git a/mev-lib/src/types/bellatrix.rs → mev-rs/src/types/bellatrix.rs b/mev-lib/src/types/bellatrix.rs → mev-rs/src/types/bellatrix.rs
diff --git a/mev-lib/src/types/capella.rs → mev-rs/src/types/capella.rs b/mev-lib/src/types/capella.rs → mev-rs/src/types/capella.rs
diff --git a/mev-lib/src/types/mod.rs → mev-rs/src/types/mod.rs b/mev-lib/src/types/mod.rs → mev-rs/src/types/mod.rs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,4 @@ parking_lot = "0.12.1"

		ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus" }

		mev-lib = { path = "../mev-lib" }
		mev-rs = { path = "../mev-rs" }