f use standard macros to avoid manual unwraps

Author: TheBlueMatt

lightning/src/routing/router.rs

@@ -486,15 +486,15 @@ impl ReadableArgs<u32> for PaymentParameters {
 			(9, final_cltv_expiry_delta, (default_value, default_final_cltv_expiry_delta)),
 		});
 		Ok(Self {
-			payee_pubkey: payee_pubkey.0.unwrap(),
-			max_total_cltv_expiry_delta: max_total_cltv_expiry_delta.0.unwrap(),
+			payee_pubkey: _init_tlv_based_struct_field!(payee_pubkey, required),
+			max_total_cltv_expiry_delta: _init_tlv_based_struct_field!(max_total_cltv_expiry_delta, (default_value, unused)),
 			features,
-			max_path_count: max_path_count.0.unwrap(),
+			max_path_count: _init_tlv_based_struct_field!(max_path_count, (default_value, unused)),
 			route_hints: route_hints.unwrap_or(Vec::new()),
-			max_channel_saturation_power_of_half: max_channel_saturation_power_of_half.0.unwrap(),
+			max_channel_saturation_power_of_half: _init_tlv_based_struct_field!(max_channel_saturation_power_of_half, (default_value, unused)),
 			expiry_time,
 			previously_failed_channels: previously_failed_channels.unwrap_or(Vec::new()),
-			final_cltv_expiry_delta: final_cltv_expiry_delta.0.unwrap(),
+			final_cltv_expiry_delta: _init_tlv_based_struct_field!(final_cltv_expiry_delta, (default_value, unused)),
 		})
 	}
 }