Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-focil-branch

This commit is contained in:
Eitan Seri-Levi
2026-01-02 08:52:20 -06:00
12 changed files with 26 additions and 134 deletions

View File

@@ -120,7 +120,6 @@ pub async fn build_libp2p_instance(
boot_nodes: Vec<Enr>,
fork_name: ForkName,
chain_spec: Arc<ChainSpec>,
service_name: String,
disable_peer_scoring: bool,
inbound_rate_limiter: Option<InboundRateLimiterConfig>,
) -> Libp2pInstance {
@@ -129,7 +128,7 @@ pub async fn build_libp2p_instance(
let (signal, exit) = async_channel::bounded(1);
let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
let executor = task_executor::TaskExecutor::new(rt, exit, shutdown_tx, service_name);
let executor = task_executor::TaskExecutor::new(rt, exit, shutdown_tx);
let custody_group_count = chain_spec.custody_requirement;
let libp2p_context = lighthouse_network::Context {
config,
@@ -179,7 +178,6 @@ pub async fn build_node_pair(
vec![],
fork_name,
spec.clone(),
"sender".to_string(),
disable_peer_scoring,
inbound_rate_limiter.clone(),
)
@@ -189,7 +187,6 @@ pub async fn build_node_pair(
vec![],
fork_name,
spec.clone(),
"receiver".to_string(),
disable_peer_scoring,
inbound_rate_limiter,
)
@@ -268,16 +265,7 @@ pub async fn build_linear(
let mut nodes = Vec::with_capacity(n);
for _ in 0..n {
nodes.push(
build_libp2p_instance(
rt.clone(),
vec![],
fork_name,
spec.clone(),
"linear".to_string(),
false,
None,
)
.await,
build_libp2p_instance(rt.clone(), vec![], fork_name, spec.clone(), false, None).await,
);
}