Skip to content

Commit 46c09f9

Browse files
committed
fix deadlock in test
1 parent 51100a5 commit 46c09f9

File tree

1 file changed

+13
-6
lines changed
  • crates/chain-orchestrator/src

1 file changed

+13
-6
lines changed

crates/chain-orchestrator/src/lib.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,7 +2141,7 @@ mod tests {
21412141
use scroll_alloy_provider::ScrollAuthApiEngineClient;
21422142
use scroll_db::test_utils::setup_test_db;
21432143
use scroll_engine::ForkchoiceState;
2144-
use scroll_network::ScrollNetworkHandle;
2144+
use scroll_network::{NetworkConfigBuilder, ScrollWireConfig};
21452145
use std::collections::HashMap;
21462146
use std::sync::Arc;
21472147
use tokio::sync::mpsc;
@@ -2175,13 +2175,20 @@ mod tests {
21752175
let mock_l1_provider = MockL1Provider { db: db.clone(), blobs: HashMap::new() };
21762176
let derivation_pipeline = DerivationPipeline::new(mock_l1_provider, db.clone(), u64::MAX).await;
21772177

2178-
// create Scroll network
2179-
let (tx, _rx) = mpsc::unbounded_channel();
2180-
let network_handle = ScrollNetworkHandle::new(tx, node.inner.clone().network);
2178+
let (scroll_network_manager, scroll_network_handle) = scroll_network::ScrollNetworkManager::new(
2179+
node.inner.chain_spec().clone(),
2180+
NetworkConfigBuilder::<ScrollNetworkPrimitives>::with_rng_secret_key().build_with_noop_provider(node.inner.chain_spec().clone()),
2181+
ScrollWireConfig::new(true),
2182+
None,
2183+
Default::default(),
2184+
None,
2185+
)
2186+
.await;
2187+
tokio::spawn(scroll_network_manager);
21812188

21822189
// create full block client
21832190
let block_client = FullBlockClient::new(
2184-
network_handle
2191+
scroll_network_handle
21852192
.inner()
21862193
.fetch_client()
21872194
.await
@@ -2211,7 +2218,7 @@ mod tests {
22112218
l2_provider,
22122219
l1_notification_rx,
22132220
Some(mock_l1_watcher_handle.clone()),
2214-
network_handle.into_scroll_network().await,
2221+
scroll_network_handle.into_scroll_network().await,
22152222
Box::new(NoopConsensus::default()),
22162223
engine,
22172224
Some(Sequencer::new(Arc::new(MockL1Provider { db: db.clone(), blobs: HashMap::new() }), SequencerConfig {

0 commit comments

Comments
 (0)