From 90dcba360ab8314df0daeb85b840216825638711 Mon Sep 17 00:00:00 2001 From: joshieDo <93316087+joshieDo@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:17:35 +0000 Subject: [PATCH] rename to odyssey-common --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- crates/{constants => common}/Cargo.toml | 2 +- crates/{constants/src/lib.rs => common/src/constants.rs} | 2 ++ crates/common/src/lib.rs | 7 +++++++ crates/e2e-tests/Cargo.toml | 2 +- crates/e2e-tests/src/tests.rs | 2 +- crates/node/Cargo.toml | 2 +- crates/node/src/rpc.rs | 2 +- 9 files changed, 19 insertions(+), 10 deletions(-) rename crates/{constants => common}/Cargo.toml (91%) rename crates/{constants/src/lib.rs => common/src/constants.rs} (92%) create mode 100644 crates/common/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 22674f2..d37fcee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4567,7 +4567,7 @@ dependencies = [ ] [[package]] -name = "odyssey-constants" +name = "odyssey-common" version = "0.0.0" dependencies = [ "alloy-primitives", @@ -4582,7 +4582,7 @@ dependencies = [ "alloy-rpc-types", "alloy-signer-local", "ci_info", - "odyssey-constants", + "odyssey-common", "serde", "tokio", "url", @@ -4599,7 +4599,7 @@ dependencies = [ "alloy-rpc-types-eth", "eyre", "jsonrpsee", - "odyssey-constants", + "odyssey-common", "reth-chainspec", "reth-cli", "reth-errors", diff --git a/Cargo.toml b/Cargo.toml index a10892f..8d74019 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "bin/odyssey/", - "crates/constants", + "crates/common", "crates/node", "crates/e2e-tests", "crates/wallet", @@ -135,7 +135,7 @@ strip = false [workspace.dependencies] # odyssey -odyssey-constants = { path = "crates/constants" } +odyssey-common = { path = "crates/common" } odyssey-node = { path = "crates/node" } odyssey-wallet = { path = "crates/wallet" } odyssey-walltime = { path = "crates/walltime" } diff --git a/crates/constants/Cargo.toml b/crates/common/Cargo.toml similarity index 91% rename from crates/constants/Cargo.toml rename to crates/common/Cargo.toml index 308eba0..a15a44e 100644 --- a/crates/constants/Cargo.toml +++ b/crates/common/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "odyssey-constants" +name = "odyssey-common" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/crates/constants/src/lib.rs b/crates/common/src/constants.rs similarity index 92% rename from crates/constants/src/lib.rs rename to crates/common/src/constants.rs index 812572f..1b175e2 100644 --- a/crates/constants/src/lib.rs +++ b/crates/common/src/constants.rs @@ -1,3 +1,5 @@ +//! Odyssey constants. + use alloy_primitives::{address, Address}; /// Withdrawal predeployed contract address. diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs new file mode 100644 index 0000000..5018fe5 --- /dev/null +++ b/crates/common/src/lib.rs @@ -0,0 +1,7 @@ +//! Odyssey common types and constants + +#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] +#![warn(unused_crate_dependencies)] + +mod constants; +pub use constants::WITHDRAWAL_CONTRACT; diff --git a/crates/e2e-tests/Cargo.toml b/crates/e2e-tests/Cargo.toml index 6b986d0..f55374a 100644 --- a/crates/e2e-tests/Cargo.toml +++ b/crates/e2e-tests/Cargo.toml @@ -10,7 +10,7 @@ keywords.workspace = true categories.workspace = true [dev-dependencies] -odyssey-constants.workspace = true +odyssey-common.workspace = true alloy.workspace = true alloy-network.workspace = true diff --git a/crates/e2e-tests/src/tests.rs b/crates/e2e-tests/src/tests.rs index 6f3cc62..0861c19 100644 --- a/crates/e2e-tests/src/tests.rs +++ b/crates/e2e-tests/src/tests.rs @@ -152,7 +152,7 @@ async fn test_withdrawal_proof_with_fallback() -> Result<(), Box