From fcfbbd3cf434e5816de81a9b6beb9fb569572cba Mon Sep 17 00:00:00 2001
From: Tumas <tumas@grandine.io>
Date: Mon, 13 Jan 2025 13:37:57 +0200
Subject: [PATCH] Upgrade consensus-spec-tests to v1.5.0-beta.0

---
 consensus-spec-tests                        | 2 +-
 eip_7594/src/lib.rs                         | 4 ++--
 eth2_libp2p                                 | 2 +-
 grandine-snapshot-tests                     | 2 +-
 scripts/ci/consensus-spec-tests-coverage.rb | 1 +
 types/src/config.rs                         | 7 ++-----
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/consensus-spec-tests b/consensus-spec-tests
index 0000c875..8b8e1edf 160000
--- a/consensus-spec-tests
+++ b/consensus-spec-tests
@@ -1 +1 @@
-Subproject commit 0000c8751776e5835f999ab3a904022bfd96b95d
+Subproject commit 8b8e1edf2c49b9782e5dce22e29ea31399498133
diff --git a/eip_7594/src/lib.rs b/eip_7594/src/lib.rs
index b9c0f11c..c013ff7a 100644
--- a/eip_7594/src/lib.rs
+++ b/eip_7594/src/lib.rs
@@ -78,8 +78,8 @@ mod tests {
 
     #[duplicate_item(
         glob                                                                              function_name                 preset;
-        ["consensus-spec-tests/tests/mainnet/fulu/networking/get_custody_columns/*/*"] [get_custody_groups_mainnet] [Mainnet];
-        ["consensus-spec-tests/tests/minimal/fulu/networking/get_custody_columns/*/*"] [get_custody_groups_minimal] [Minimal];
+        ["consensus-spec-tests/tests/mainnet/fulu/networking/get_custody_groups/*/*"] [get_custody_groups_mainnet] [Mainnet];
+        ["consensus-spec-tests/tests/minimal/fulu/networking/get_custody_groups/*/*"] [get_custody_groups_minimal] [Minimal];
     )]
     #[test_resources(glob)]
     fn function_name(case: Case) {
diff --git a/eth2_libp2p b/eth2_libp2p
index 0d2df502..23b1df44 160000
--- a/eth2_libp2p
+++ b/eth2_libp2p
@@ -1 +1 @@
-Subproject commit 0d2df50290d92d101ef53a55e2edd6d614f84476
+Subproject commit 23b1df44c7e122f7701f7d8610bb839702147654
diff --git a/grandine-snapshot-tests b/grandine-snapshot-tests
index c531cc15..89a24364 160000
--- a/grandine-snapshot-tests
+++ b/grandine-snapshot-tests
@@ -1 +1 @@
-Subproject commit c531cc15dab36638b713a80432f7544a5424dd57
+Subproject commit 89a24364dd8ddd5ce0f4e3a6a58c7b27fa553849
diff --git a/scripts/ci/consensus-spec-tests-coverage.rb b/scripts/ci/consensus-spec-tests-coverage.rb
index 4f8dbee5..1b68a6a6 100755
--- a/scripts/ci/consensus-spec-tests-coverage.rb
+++ b/scripts/ci/consensus-spec-tests-coverage.rb
@@ -15,6 +15,7 @@
   presets/*/trusted_setups/*.json
   tests/*/*/light_client/sync/pyspec_tests/*/*.{ssz_snappy,yaml}
   tests/*/*/light_client/update_ranking/pyspec_tests/*/*.{ssz_snappy,yaml}
+  tests/*/*/light_client/data_collection/pyspec_tests/*/*.{ssz_snappy,yaml}
   tests/*/eip6110/*/*/*/*/*.{ssz_snappy,yaml}
   tests/*/fulu/*/*/*/*/*.{ssz_snappy,yaml}
   tests/*/whisk/*/*/*/*/*.{ssz_snappy,yaml}
diff --git a/types/src/config.rs b/types/src/config.rs
index 6a553617..5464bd9a 100644
--- a/types/src/config.rs
+++ b/types/src/config.rs
@@ -122,9 +122,7 @@ pub struct Config {
     #[serde(with = "serde_utils::string_or_native")]
     pub epochs_per_subnet_subscription: NonZeroU64,
     #[serde(with = "serde_utils::string_or_native")]
-    pub gossip_max_size: usize,
-    #[serde(with = "serde_utils::string_or_native")]
-    pub max_chunk_size: usize,
+    pub max_payload_size: usize,
     pub message_domain_valid_snappy: DomainType,
     #[serde(with = "serde_utils::string_or_native")]
     pub resp_timeout: u64,
@@ -233,8 +231,7 @@ impl Default for Config {
             // Networking
             attestation_subnet_extra_bits: 0,
             epochs_per_subnet_subscription: nonzero!(256_u64),
-            gossip_max_size: 10_485_760,
-            max_chunk_size: 10_485_760,
+            max_payload_size: 10_485_760,
             message_domain_valid_snappy: H32(hex!("01000000")),
             resp_timeout: 10,
             subnets_per_node: 2,