refactor: set default on all config values (#119)

0xPolygon · Oct 9, 2024 · 999b7b6 · 999b7b6
1 parent f8bd4d9
commit 999b7b6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/crates/cdk-config/src/aggregator.rs b/crates/cdk-config/src/aggregator.rs
@@ -110,7 +110,6 @@ fn default_address() -> Address {
         .unwrap()
 }
 
-#[cfg(any(test, feature = "testutils"))]
 impl Default for Aggregator {
     fn default() -> Self {
         // Values are coming from https://github.com/0xPolygon/agglayer/blob/main/config/default.go#L11

diff --git a/crates/cdk-config/src/l1.rs b/crates/cdk-config/src/l1.rs
@@ -4,19 +4,18 @@ use serde::Deserialize;
 /// The L1 configuration.
 #[derive(Deserialize, Debug, Clone)]
 pub struct L1 {
-    #[serde(rename = "L1ChainID")]
+    #[serde(rename = "L1ChainID", alias = "ChainID", default)]
     pub l1_chain_id: String,
-    #[serde(rename = "PolAddr")]
+    #[serde(rename = "PolAddr", default)]
     pub pol_addr: Address,
-    #[serde(rename = "ZkEVMAddr")]
+    #[serde(rename = "ZkEVMAddr", default)]
     pub zk_evm_addr: Address,
-    #[serde(rename = "RollupManagerAddr")]
+    #[serde(rename = "RollupManagerAddr", default)]
     pub rollup_manager_addr: Address,
-    #[serde(rename = "GlobalExitRootManagerAddr")]
+    #[serde(rename = "GlobalExitRootManagerAddr", default)]
     pub global_exit_root_manager_addr: Address,
 }
 
-#[cfg(any(test, feature = "testutils"))]
 impl Default for L1 {
     fn default() -> Self {
         // Values are coming from https://github.com/0xPolygon/agglayer/blob/main/config/default.go#L11

diff --git a/crates/cdk-config/src/lib.rs b/crates/cdk-config/src/lib.rs
@@ -21,18 +21,18 @@ use sequence_sender::SequenceSender;
 #[cfg_attr(any(test, feature = "testutils"), derive(Default))]
 pub struct Config {
     /// The log configuration.
-    #[serde(rename = "Log")]
+    #[serde(rename = "Log", default)]
     pub log: Log,
 
     #[serde(rename = "ForkUpgradeBatchNumber")]
     pub fork_upgrade_batch_number: Option<u64>,
 
-    #[serde(rename = "NetworkConfig")]
+    #[serde(rename = "NetworkConfig", default)]
     pub network_config: network_config::NetworkConfig,
 
-    #[serde(rename = "Aggregator")]
+    #[serde(rename = "Aggregator", default)]
     pub aggregator: aggregator::Aggregator,
 
-    #[serde(rename = "SequenceSender")]
+    #[serde(rename = "SequenceSender", default)]
     pub sequence_sender: SequenceSender,
 }
diff --git a/crates/cdk-config/src/network_config.rs b/crates/cdk-config/src/network_config.rs
@@ -4,11 +4,10 @@ use serde::Deserialize;
 /// The L1 configuration.
 #[derive(Deserialize, Debug, Clone)]
 pub struct NetworkConfig {
-    #[serde(rename = "L1")]
+    #[serde(rename = "L1", default)]
     pub l1: L1,
 }
 
-#[cfg(any(test, feature = "testutils"))]
 impl Default for NetworkConfig {
     fn default() -> Self {
         Self { l1: L1::default() }