Clap fix

Author: squadgazzz

crates/autopilot/src/arguments.rs

@@ -565,7 +565,7 @@ pub struct FeePoliciesConfig {
 
     /// Volume fee policies that will become effective at a future timestamp.
     #[clap(flatten)]
-    pub upcoming_fee_policies: Option<UpcomingFeePolicies>,
+    pub upcoming_fee_policies: UpcomingFeePolicies,
 }
 
 /// A fee policy to be used for orders base on it's class.
@@ -602,7 +602,7 @@ pub struct UpcomingFeePolicies {
         long = "upcoming-fee-policies-timestamp",
         env = "UPCOMING_FEE_POLICIES_TIMESTAMP"
     )]
-    pub effective_from_timestamp: DateTime<Utc>,
+    pub effective_from_timestamp: Option<DateTime<Utc>>,
 }
 
 #[derive(clap::Parser, Debug, Clone)]

crates/autopilot/src/domain/fee/mod.rs

@@ -57,16 +57,20 @@ pub struct UpcomingProtocolFees {
     effective_from_timestamp: DateTime<Utc>,
 }
 
-impl From<arguments::UpcomingFeePolicies> for UpcomingProtocolFees {
+impl From<arguments::UpcomingFeePolicies> for Option<UpcomingProtocolFees> {
     fn from(value: arguments::UpcomingFeePolicies) -> Self {
-        Self {
-            fee_policies: value
-                .fee_policies
-                .into_iter()
-                .map(ProtocolFee::from)
-                .collect::<Vec<_>>(),
-            effective_from_timestamp: value.effective_from_timestamp,
-        }
+        value
+            // both config fields must be non-empty
+            .effective_from_timestamp
+            .filter(|_| !value.fee_policies.is_empty())
+            .map(|effective_from_timestamp| UpcomingProtocolFees {
+                fee_policies: value
+                    .fee_policies
+                    .into_iter()
+                    .map(ProtocolFee::from)
+                    .collect::<Vec<_>>(),
+                effective_from_timestamp,
+            })
     }
 }
 
@@ -88,10 +92,7 @@ impl ProtocolFees {
                 .map(ProtocolFee::from)
                 .collect(),
             max_partner_fee: config.fee_policy_max_partner_fee,
-            upcoming_fee_policies: config
-                .upcoming_fee_policies
-                .clone()
-                .map(UpcomingProtocolFees::from),
+            upcoming_fee_policies: config.upcoming_fee_policies.clone().into(),
         }
     }