Merge branch 'main' into kunal/send-receiver-forge-test

hyperlane-xyz · Dec 14, 2023 · 93182e9 · 93182e9
2 parents 6c5bbef + a888cf7
commit 93182e9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/rust/agents/relayer/src/settings/mod.rs b/rust/agents/relayer/src/settings/mod.rs
@@ -143,7 +143,7 @@ impl FromRawConf<RawRelayerSettings> for RelayerSettings {
             raw_gas_payment_enforcement_path,
             &raw_gas_payment_enforcement,
         );
-        let gas_payment_enforcement = gas_payment_enforcement_parser.into_array_iter().map(|itr| {
+        let mut gas_payment_enforcement = gas_payment_enforcement_parser.into_array_iter().map(|itr| {
             itr.filter_map(|policy| {
                 let policy_type = policy.chain(&mut err).get_opt_key("type").parse_string().end();
                 let minimum_is_defined = matches!(policy.get_opt_key("minimum"), Ok(Some(_)));
@@ -187,7 +187,11 @@ impl FromRawConf<RawRelayerSettings> for RelayerSettings {
                     matching_list,
                 })
             }).collect_vec()
-        }).unwrap_or_else(|_| vec![GasPaymentEnforcementConf::default()]);
+        }).unwrap_or_default();
+
+        if gas_payment_enforcement.is_empty() {
+            gas_payment_enforcement.push(GasPaymentEnforcementConf::default());
+        }
 
         let whitelist = p
             .chain(&mut err)