Skip to content

Commit 847fa3f

Browse files
Remove context_deserialize and import from crates.io (#8172)
Use the recently published `context_deserialize` and remove it from Lighthouse Co-Authored-By: Mac L <mjladson@pm.me> Co-Authored-By: Michael Sproul <michael@sigmaprime.io>
1 parent e291955 commit 847fa3f

File tree

11 files changed

+32
-498
lines changed

11 files changed

+32
-498
lines changed

Cargo.lock

Lines changed: 24 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ members = [
4747
"common/validator_dir",
4848
"common/warp_utils",
4949
"common/workspace_members",
50-
"consensus/context_deserialize/context_deserialize",
51-
"consensus/context_deserialize/context_deserialize_derive",
5250
"consensus/fixed_bytes",
5351
"consensus/fork_choice",
5452
"consensus/int_to_bytes",
@@ -122,10 +120,7 @@ clap = { version = "4.5.4", features = ["derive", "cargo", "wrap_help"] }
122120
clap_utils = { path = "common/clap_utils" }
123121
compare_fields = "0.1"
124122
console-subscriber = "0.4"
125-
context_deserialize = { path = "consensus/context_deserialize/context_deserialize", features = [
126-
"all",
127-
] }
128-
context_deserialize_derive = { path = "consensus/context_deserialize/context_deserialize_derive" }
123+
context_deserialize = "0.2"
129124
criterion = "0.5"
130125
delay_map = "0.4"
131126
deposit_contract = { path = "common/deposit_contract" }
@@ -143,10 +138,10 @@ eth2_key_derivation = { path = "crypto/eth2_key_derivation" }
143138
eth2_keystore = { path = "crypto/eth2_keystore" }
144139
eth2_network_config = { path = "common/eth2_network_config" }
145140
eth2_wallet = { path = "crypto/eth2_wallet" }
146-
ethereum_hashing = "0.7.0"
141+
ethereum_hashing = "0.8.0"
147142
ethereum_serde_utils = "0.8.0"
148-
ethereum_ssz = "0.9.0"
149-
ethereum_ssz_derive = "0.9.0"
143+
ethereum_ssz = { version = "0.10.0", features = ["context_deserialize"] }
144+
ethereum_ssz_derive = "0.10.0"
150145
execution_layer = { path = "beacon_node/execution_layer" }
151146
exit-future = "0.2"
152147
filesystem = { path = "common/filesystem" }
@@ -183,7 +178,7 @@ malloc_utils = { path = "common/malloc_utils" }
183178
maplit = "1"
184179
merkle_proof = { path = "consensus/merkle_proof" }
185180
metrics = { path = "common/metrics" }
186-
milhouse = { version = "0.7", default-features = false }
181+
milhouse = { version = "0.9", default-features = false, features = ["context_deserialize"] }
187182
mockall = "0.13"
188183
mockall_double = "0.3"
189184
mockito = "1.5.0"
@@ -232,7 +227,7 @@ slashing_protection = { path = "validator_client/slashing_protection" }
232227
slot_clock = { path = "common/slot_clock" }
233228
smallvec = { version = "1.11.2", features = ["arbitrary"] }
234229
snap = "1"
235-
ssz_types = "0.12.2"
230+
ssz_types = { version = "0.14.0", features = ["context_deserialize"] }
236231
state_processing = { path = "consensus/state_processing" }
237232
store = { path = "beacon_node/store" }
238233
strum = { version = "0.24", features = ["derive"] }
@@ -257,8 +252,8 @@ tracing-core = "0.1"
257252
tracing-log = "0.2"
258253
tracing-opentelemetry = "0.31.0"
259254
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
260-
tree_hash = "0.10.0"
261-
tree_hash_derive = "0.10.0"
255+
tree_hash = "0.12.0"
256+
tree_hash_derive = "0.12.0"
262257
types = { path = "consensus/types" }
263258
url = "2"
264259
uuid = { version = "0.8", features = ["serde", "v4"] }

consensus/context_deserialize/context_deserialize/Cargo.toml

Lines changed: 0 additions & 17 deletions
This file was deleted.

consensus/context_deserialize/context_deserialize/src/impls/core.rs

Lines changed: 0 additions & 103 deletions
This file was deleted.

consensus/context_deserialize/context_deserialize/src/impls/milhouse.rs

Lines changed: 0 additions & 45 deletions
This file was deleted.

consensus/context_deserialize/context_deserialize/src/impls/mod.rs

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)