fix: rebase master and fix conflicts

a16z · Mar 2, 2024 · b99f408 · b99f408
1 parent e1d78d1
commit b99f408
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -134,6 +134,7 @@ pub struct CliConfig {
     /// The port to serve the Magi RPC on.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rpc_port: Option<u16>,
+    /// The address to serve the Magi RPC on.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rpc_addr: Option<String>,
     /// If Magi is running in devnet mode.

diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs
@@ -182,6 +182,7 @@ mod tests {
         std::env::set_var("RUST_LOG", "trace");
         let cli_config = CliConfig {
             l1_rpc_url: Some("".to_string()),
+            l1_beacon_url: None,
             l2_rpc_url: None,
             l2_engine_url: None,
             jwt_secret: Some("".to_string()),