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

Merge conflicts'

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-23 02:34:34 +09:00
parent 755b8d8510
commit ca59cf453e
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/network/src/router.rs
View File

@@ -19,7 +19,7 @@ use lighthouse_network::{
};
use logging::TimeLatch;
use logging::crit;
use slot_clock::SlotClock;
use slot_clock::{SlotClock, timestamp_now};
use std::sync::Arc;
use tokio::sync::mpsc;
use tokio_stream::wrappers::UnboundedReceiverStream;

2
beacon_node/network/src/sync/manager.rs
View File

@@ -66,7 +66,7 @@ use lighthouse_network::types::{NetworkGlobals, SyncState};
use lighthouse_network::{PeerAction, PeerId};
use logging::crit;
use lru_cache::LRUTimeCache;
use slot_clock::SlotClock;
use slot_clock::{SlotClock, timestamp_now};
use std::ops::Sub;
use std::sync::Arc;
use std::time::Duration;