Skip to content

feat: split off serde_json dependency to its own feature #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rakita merged 2 commits into from
Feb 19, 2024
Merged

feat: split off serde_json dependency to its own feature #1104

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
902d4bc
feat: split off serde_json dependency to its own feature
DaniPopes Feb 19, 2024
e74dbee
chore: rename to 'serde-json'
DaniPopes Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
chore: rename to 'serde-json'
  • Loading branch information
@DaniPopes
DaniPopes committed Feb 19, 2024
commit e74dbee72df3dfa2178ed36fb18fa52d497801b5
3 changes: 1 addition & 2 deletions bins/revme/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ license = "MIT"
repository = "https://github.com/bluealloy/revm"
description = "Rust Ethereum Virtual Machine Executable"
version = "0.2.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
hash-db = "0.15"
Expand All @@ -17,7 +16,7 @@ plain_hasher = "0.2"
revm = { path = "../../crates/revm", version = "6.0.0", default-features = false, features = [
"ethersdb",
"std",
"json",
"serde-json",
"c-kzg",
] }
alloy-rlp = { version = "0.3", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion crates/revm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ std = [
"revm-precompile/std",
]
serde = ["dep:serde", "revm-interpreter/serde"]
json = ["serde", "dep:serde_json"]
serde-json = ["serde", "dep:serde_json"]
arbitrary = ["revm-interpreter/arbitrary"]
asm-keccak = ["revm-interpreter/asm-keccak", "revm-precompile/asm-keccak"]

Expand Down
2 changes: 1 addition & 1 deletion crates/revm/src/db/in_memory_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ mod tests {
assert_eq!(new_state.storage(account, key1), Ok(value1));
}

#[cfg(feature = "json")]
#[cfg(feature = "serde-json")]
#[test]
fn test_serialize_deserialize_cachedb() {
let account = Address::with_last_byte(69);
Expand Down
4 changes: 2 additions & 2 deletions crates/revm/src/inspector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use auto_impl::auto_impl;

#[cfg(feature = "std")]
mod customprinter;
#[cfg(all(feature = "std", feature = "json"))]
#[cfg(all(feature = "std", feature = "serde-json"))]
mod eip3155;
mod gas;
mod handler_register;
Expand All @@ -22,7 +22,7 @@ use revm_interpreter::{CallOutcome, CreateOutcome};
pub mod inspectors {
#[cfg(feature = "std")]
pub use super::customprinter::CustomPrintTracer;
#[cfg(all(feature = "std", feature = "json"))]
#[cfg(all(feature = "std", feature = "serde-json"))]
pub use super::eip3155::TracerEip3155;
pub use super::gas::GasInspector;
pub use super::noop::NoOpInspector;
Expand Down