gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-29 18:53:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conlfict

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-23 02:15:26 +09:00
parent 20f0c7bf4b cfc748309f
commit 755b8d8510
148 changed files with 5482 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_node/lighthouse_network/src/peer_manager/mod.rs
View File

@@ -3087,6 +3087,9 @@ mod tests {
const MAX_TEST_PEERS: usize = 300;
proptest! {
// 64 cases (down from default 256) keeps this test under 10s while
// still providing good random coverage of the pruning logic.
#![proptest_config(ProptestConfig::with_cases(64))]
#[test]
fn prune_excess_peers(peer_conditions in proptest::collection::vec(peer_condition_strategy(), DEFAULT_TARGET_PEERS..=MAX_TEST_PEERS)) {
let target_peer_count = DEFAULT_TARGET_PEERS;

4
beacon_node/lighthouse_network/src/rpc/codec.rs
View File

@@ -1088,9 +1088,11 @@ mod tests {
let mut block: BeaconBlockBellatrix<_, FullPayload<Spec>> =
BeaconBlockBellatrix::empty(spec);
// 11,000 × 1KB ≈ 11MB, just above the 10MB max_payload_size.
// Previously used 100,000 txs (~100MB) which made this test take >60s.
let tx = VariableList::try_from(vec![0; 1024]).unwrap();
let txs =
VariableList::try_from(std::iter::repeat_n(tx, 100000).collect::<Vec<_>>()).unwrap();
VariableList::try_from(std::iter::repeat_n(tx, 11000).collect::<Vec<_>>()).unwrap();
block.body.execution_payload.execution_payload.transactions = txs;