diff --git a/Cargo.lock b/Cargo.lock index 8279551..0c5afde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2582,20 +2582,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] -name = "revive-differential-testing-core" +name = "revive-dt-core" version = "0.1.0" dependencies = [ "anyhow", "clap", "env_logger", "log", - "revive-differential-testing-format", + "revive-dt-format", "serde", "serde_json", ] [[package]] -name = "revive-differential-testing-format" +name = "revive-dt-format" version = "0.1.0" dependencies = [ "alloy", @@ -2607,7 +2607,7 @@ dependencies = [ ] [[package]] -name = "revive-differential-testing-node-interaction" +name = "revive-dt-node-interaction" version = "0.1.0" dependencies = [ "alloy", @@ -3051,9 +3051,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ "fastrand", "getrandom 0.3.2", diff --git a/Cargo.toml b/Cargo.toml index df130be..6f42a84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,9 @@ repository = "https://github.com/paritytech/revive-differential-testing.git" rust-version = "1.85.0" [workspace.dependencies] -revive-differential-testing-format = { version = "0.1.0", path = "crates/format" } +revive-dt-core = { version = "0.1.0", path = "crates/core" } +revive-dt-format = { version = "0.1.0", path = "crates/format" } +revive-dt-node-interaction = { version = "0.1.0", path = "crates/node-interaction" } anyhow = "1.0" alloy = { version = "0.12.6", default-features = false, features = [ "providers", "rpc-types", "json-abi", "hyper", "std" ] } @@ -23,8 +25,8 @@ hex = "0.4.3" log = "0.4.26" once_cell = "1.21" semver = "1.0" -serde = { version = "1.0", features = ["derive"] } -serde_json = { version = "1.0", features = ["arbitrary_precision"] } +serde = { version = "1.0", default-features = false, features = ["derive"] } +serde_json = { version = "1.0", default-features = false, features = ["arbitrary_precision"] } tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] } # revive compiler diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index f998bc5..18d8087 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "revive-differential-testing-core" +name = "revive-dt-core" version.workspace = true authors.workspace = true license.workspace = true @@ -12,10 +12,11 @@ name = "retester" path = "src/main.rs" [dependencies] +revive-dt-format = { workspace = true } + anyhow = { workspace = true } clap = { workspace = true } log = { workspace = true } env_logger = { workspace = true } -revive-differential-testing-format = { workspace = true } serde = { workspace = true, features = [ "derive" ] } serde_json = { workspace = true } diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs index 6949931..4f673ae 100644 --- a/crates/core/src/main.rs +++ b/crates/core/src/main.rs @@ -2,8 +2,8 @@ use std::collections::BTreeSet; use clap::Parser; -use revive_differential_testing_core::arguments::Arguments; -use revive_differential_testing_format::corpus::Corpus; +use revive_dt_core::arguments::Arguments; +use revive_dt_format::corpus::Corpus; fn main() -> anyhow::Result<()> { env_logger::init(); diff --git a/crates/format/Cargo.toml b/crates/format/Cargo.toml index a8b0fdc..aa5ae6c 100644 --- a/crates/format/Cargo.toml +++ b/crates/format/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "revive-differential-testing-format" +name = "revive-dt-format" version.workspace = true authors.workspace = true license.workspace = true diff --git a/crates/node-interaction/Cargo.toml b/crates/node-interaction/Cargo.toml index 6c5e346..cf24a0d 100644 --- a/crates/node-interaction/Cargo.toml +++ b/crates/node-interaction/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "revive-differential-testing-node-interaction" +name = "revive-dt-node-interaction" version.workspace = true authors.workspace = true license.workspace = true diff --git a/crates/node-interaction/src/transaction.rs b/crates/node-interaction/src/transaction.rs index da97d86..844165d 100644 --- a/crates/node-interaction/src/transaction.rs +++ b/crates/node-interaction/src/transaction.rs @@ -36,8 +36,7 @@ pub fn execute_transaction( connection_string, })?; - match receipt_receiver.blocking_recv() { - Some(receipt) => receipt, - None => anyhow::bail!("no receipt received"), - } + receipt_receiver + .blocking_recv() + .unwrap_or_else(|| anyhow::bail!("no receipt received")) }