Re-export context_deserialize_derive inside context_deserialize (#7852)

Re-export `context_deserialize_derive` inside of `context_deserialize` so they are both available from the same interface, which matches how popular crates (like `serde`) handle this.

This also nests both crates inside a new `context_deserialize` directory which will make it easier to eventually spin out into a different repo (if/when) we decide to do that (plus I prefer it aesthetically).
This commit is contained in:
Mac L
2025-08-12 15:16:19 +10:00
committed by GitHub
parent 918121e313
commit 152f2bb2e4
21 changed files with 56 additions and 39 deletions

View File

@@ -1,7 +1,10 @@
[package]
name = "types"
version = "0.2.1"
authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com>"]
authors = [
"Paul Hauner <paul@paulhauner.com>",
"Age Manning <Age@AgeManning.com>",
]
edition = { workspace = true }
[features]
@@ -28,7 +31,6 @@ bls = { workspace = true }
compare_fields = { workspace = true }
compare_fields_derive = { workspace = true }
context_deserialize = { workspace = true }
context_deserialize_derive = { workspace = true }
derivative = { workspace = true }
eth2_interop_keypairs = { path = "../../common/eth2_interop_keypairs" }
ethereum_hashing = { workspace = true }

View File

@@ -1,7 +1,7 @@
use crate::slot_data::SlotData;
use crate::test_utils::TestRandom;
use crate::{Checkpoint, ForkName, Hash256, SignedRoot, Slot};
use context_deserialize_derive::context_deserialize;
use context_deserialize::context_deserialize;
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;

View File

@@ -1,7 +1,7 @@
use crate::test_utils::TestRandom;
use crate::*;
use context_deserialize_derive::context_deserialize;
use context_deserialize::context_deserialize;
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;

View File

@@ -1,6 +1,6 @@
use crate::test_utils::TestRandom;
use crate::{Epoch, ForkName, Hash256};
use context_deserialize_derive::context_deserialize;
use context_deserialize::context_deserialize;
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};
use test_random_derive::TestRandom;

View File

@@ -1,6 +1,6 @@
use crate::test_utils::TestRandom;
use crate::{Epoch, ForkName};
use context_deserialize_derive::context_deserialize;
use context_deserialize::context_deserialize;
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};

View File

@@ -1,6 +1,6 @@
use crate::test_utils::TestRandom;
use crate::{ForkName, Hash256, SignedRoot};
use context_deserialize_derive::context_deserialize;
use context_deserialize::context_deserialize;
use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode};

View File

@@ -287,8 +287,7 @@ pub use bls::{
AggregatePublicKey, AggregateSignature, Keypair, PublicKey, PublicKeyBytes, SecretKey,
Signature, SignatureBytes,
};
pub use context_deserialize::ContextDeserialize;
pub use context_deserialize_derive::context_deserialize;
pub use context_deserialize::{context_deserialize, ContextDeserialize};
pub use kzg::{KzgCommitment, KzgProof, VERSIONED_HASH_VERSION_KZG};
pub use milhouse::{self, List, Vector};
pub use ssz_types::{typenum, typenum::Unsigned, BitList, BitVector, FixedVector, VariableList};