Skip to content

Commit 08c535f

Browse files
yiweichiyiweichi
committed
fix: NetworkArgs default value
1 parent fb8effb commit 08c535f

File tree

4 files changed

+60
-12
lines changed

4 files changed

+60
-12
lines changed

‎crates/node/src/args.rs‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,11 @@ mod tests {
484484
engine_driver_args: EngineDriverArgs::default(),
485485
l1_provider_args: L1ProviderArgs::default(),
486486
beacon_provider_args: BeaconProviderArgs::default(),
487-
network_args: NetworkArgs::default(),
487+
network_args: NetworkArgs {
488+
enable_eth_scroll_wire_bridge: true,
489+
enable_scroll_wire: true,
490+
..Default::default()
491+
},
488492
};
489493

490494
let result = config.validate();
@@ -507,7 +511,11 @@ mod tests {
507511
engine_driver_args: EngineDriverArgs::default(),
508512
l1_provider_args: L1ProviderArgs::default(),
509513
beacon_provider_args: BeaconProviderArgs::default(),
510-
network_args: NetworkArgs::default(),
514+
network_args: NetworkArgs {
515+
enable_eth_scroll_wire_bridge: true,
516+
enable_scroll_wire: true,
517+
..Default::default()
518+
},
511519
};
512520

513521
let result = config.validate();
@@ -530,7 +538,11 @@ mod tests {
530538
engine_driver_args: EngineDriverArgs::default(),
531539
l1_provider_args: L1ProviderArgs::default(),
532540
beacon_provider_args: BeaconProviderArgs::default(),
533-
network_args: NetworkArgs::default(),
541+
network_args: NetworkArgs {
542+
enable_eth_scroll_wire_bridge: true,
543+
enable_scroll_wire: true,
544+
..Default::default()
545+
},
534546
};
535547

536548
assert!(config.validate().is_ok());
@@ -546,7 +558,11 @@ mod tests {
546558
engine_driver_args: EngineDriverArgs::default(),
547559
l1_provider_args: L1ProviderArgs::default(),
548560
beacon_provider_args: BeaconProviderArgs::default(),
549-
network_args: NetworkArgs::default(),
561+
network_args: NetworkArgs {
562+
enable_eth_scroll_wire_bridge: true,
563+
enable_scroll_wire: true,
564+
..Default::default()
565+
},
550566
};
551567

552568
assert!(config.validate().is_ok());
@@ -562,7 +578,11 @@ mod tests {
562578
engine_driver_args: EngineDriverArgs::default(),
563579
l1_provider_args: L1ProviderArgs::default(),
564580
beacon_provider_args: BeaconProviderArgs::default(),
565-
network_args: NetworkArgs::default(),
581+
network_args: NetworkArgs {
582+
enable_eth_scroll_wire_bridge: true,
583+
enable_scroll_wire: true,
584+
..Default::default()
585+
},
566586
};
567587

568588
assert!(config.validate().is_ok());
@@ -578,7 +598,11 @@ mod tests {
578598
engine_driver_args: EngineDriverArgs::default(),
579599
l1_provider_args: L1ProviderArgs::default(),
580600
beacon_provider_args: BeaconProviderArgs::default(),
581-
network_args: NetworkArgs::default(),
601+
network_args: NetworkArgs {
602+
enable_eth_scroll_wire_bridge: true,
603+
enable_scroll_wire: true,
604+
..Default::default()
605+
},
582606
};
583607

584608
assert!(config.validate().is_ok());

‎crates/node/src/test_utils.rs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ pub async fn generate_tx(wallet: Arc<Mutex<Wallet>>) -> Bytes {
130130
pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
131131
ScrollRollupNodeConfig {
132132
test: true,
133-
network_args: crate::args::NetworkArgs::default(),
133+
network_args: crate::args::NetworkArgs {
134+
enable_eth_scroll_wire_bridge: true,
135+
enable_scroll_wire: true,
136+
..Default::default()
137+
},
134138
database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) },
135139
l1_provider_args: L1ProviderArgs::default(),
136140
engine_driver_args: EngineDriverArgs { en_sync_trigger: 100 },
@@ -144,7 +148,11 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
144148
pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
145149
ScrollRollupNodeConfig {
146150
test: true,
147-
network_args: crate::args::NetworkArgs::default(),
151+
network_args: crate::args::NetworkArgs {
152+
enable_eth_scroll_wire_bridge: true,
153+
enable_scroll_wire: true,
154+
..Default::default()
155+
},
148156
database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) },
149157
l1_provider_args: L1ProviderArgs::default(),
150158
engine_driver_args: EngineDriverArgs { en_sync_trigger: 100 },

‎crates/node/tests/e2e.rs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ async fn can_bridge_l1_messages() -> eyre::Result<()> {
3535
let chain_spec = (*SCROLL_DEV).clone();
3636
let node_args = ScrollRollupNodeConfig {
3737
test: true,
38-
network_args: ScrollNetworkArgs::default(),
38+
network_args: ScrollNetworkArgs {
39+
enable_eth_scroll_wire_bridge: true,
40+
enable_scroll_wire: true,
41+
..Default::default()
42+
},
3943
database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) },
4044
l1_provider_args: L1ProviderArgs::default(),
4145
engine_driver_args: EngineDriverArgs::default(),
@@ -96,7 +100,11 @@ async fn can_sequence_and_gossip_blocks() {
96100
let chain_spec = (*SCROLL_DEV).clone();
97101
let rollup_manager_args = ScrollRollupNodeConfig {
98102
test: true,
99-
network_args: ScrollNetworkArgs::default(),
103+
network_args: ScrollNetworkArgs {
104+
enable_eth_scroll_wire_bridge: true,
105+
enable_scroll_wire: true,
106+
..Default::default()
107+
},
100108
database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) },
101109
l1_provider_args: L1ProviderArgs::default(),
102110
engine_driver_args: EngineDriverArgs::default(),

‎crates/sequencer/tests/e2e.rs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,11 @@ async fn can_sequence_blocks_with_private_key_file() -> eyre::Result<()> {
430430
let chain_spec = (*SCROLL_DEV).clone();
431431
let rollup_manager_args = ScrollRollupNodeConfig {
432432
test: false, // disable test mode to enable real signing
433-
network_args: NetworkArgs::default(),
433+
network_args: NetworkArgs {
434+
enable_eth_scroll_wire_bridge: true,
435+
enable_scroll_wire: true,
436+
..Default::default()
437+
},
434438
database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) },
435439
l1_provider_args: L1ProviderArgs::default(),
436440
engine_driver_args: EngineDriverArgs::default(),
@@ -514,7 +518,11 @@ async fn can_sequence_blocks_with_hex_key_file_without_prefix() -> eyre::Result<
514518
let chain_spec = (*SCROLL_DEV).clone();
515519
let rollup_manager_args = ScrollRollupNodeConfig {
516520
test: false, // disable test mode to enable real signing
517-
network_args: NetworkArgs::default(),
521+
network_args: NetworkArgs {
522+
enable_eth_scroll_wire_bridge: true,
523+
enable_scroll_wire: true,
524+
..Default::default()
525+
},
518526
database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) },
519527
l1_provider_args: L1ProviderArgs::default(),
520528
engine_driver_args: EngineDriverArgs::default(),

0 commit comments

Comments
 (0)