Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions ssz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ categories = ["cryptography::cryptocurrencies"]
[lib]
name = "ssz"

[dev-dependencies]
alloy-primitives = { version = "1.0", features = ["getrandom"] }
ethereum_ssz_derive = { version = "0.9.0", path = "../ssz_derive" }
serde_json = "1.0.0"
[features]
arbitrary = ["dep:arbitrary", "alloy-primitives/arbitrary"]
context_deserialize = ["dep:context_deserialize"]

[dependencies]
alloy-primitives = "1.0"
Expand All @@ -27,6 +26,9 @@ serde = "1.0.0"
serde_derive = "1.0.0"
typenum = "1.12.0"
arbitrary = { version = "1.0", features = ["derive"], optional = true }
context_deserialize = { version = "0.2", optional = true }

[features]
arbitrary = ["dep:arbitrary", "alloy-primitives/arbitrary"]
[dev-dependencies]
alloy-primitives = { version = "1.0", features = ["getrandom"] }
ethereum_ssz_derive = { version = "0.9.0", path = "../ssz_derive" }
serde_json = "1.0.0"
33 changes: 33 additions & 0 deletions ssz/src/context_deserialize.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
use crate::{Bitfield, Fixed, Variable};
use context_deserialize::ContextDeserialize;
use serde::{
de::{Deserializer, Error},
Deserialize,
};
use typenum::Unsigned;

impl<'de, C, N> ContextDeserialize<'de, C> for Bitfield<Variable<N>>
where
N: Unsigned + Clone,
{
fn context_deserialize<D>(deserializer: D, _context: C) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
Bitfield::<Variable<N>>::deserialize(deserializer)
.map_err(|e| D::Error::custom(format!("{:?}", e)))
}
}

impl<'de, C, N> ContextDeserialize<'de, C> for Bitfield<Fixed<N>>
where
N: Unsigned + Clone,
{
fn context_deserialize<D>(deserializer: D, _context: C) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
Bitfield::<Fixed<N>>::deserialize(deserializer)
.map_err(|e| D::Error::custom(format!("{:?}", e)))
}
}
3 changes: 3 additions & 0 deletions ssz/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ mod encode;
pub mod legacy;
mod union_selector;

#[cfg(feature = "context_deserialize")]
mod context_deserialize;

pub use bitfield::bitvector_dynamic::{BitVectorDynamic, Dynamic};
#[doc(hidden)]
pub use bitfield::{BitList, BitVector, Bitfield, Error as BitfieldError, Fixed, Variable};
Expand Down