-f Drop default()

Author: Antoine Riard

lightning/src/chain/onchain_utils.rs

@@ -609,15 +609,6 @@ impl PackageTemplate {
 	}
 }
 
-impl Default for PackageTemplate {
-	fn default() -> Self {
-		PackageTemplate {
-			inputs: Vec::new(),
-			malleability: PackageMalleability::Malleable,
-		}
-	}
-}
-
 impl Writeable for PackageTemplate {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
 		writer.write_all(&byte_utils::be64_to_array(self.inputs.len() as u64))?;
@@ -746,20 +737,6 @@ impl OnchainRequest {
 	}
 }
 
-impl Default for OnchainRequest {
-	fn default() -> Self {
-		OnchainRequest {
-			aggregation: true,
-			bump_strategy: BumpStrategy::RBF,
-			feerate_previous: 0,
-			height_timer: None,
-			absolute_timelock: ::std::u32::MAX,
-			height_original: 0,
-			content: PackageTemplate::default()
-		}
-	}
-}
-
 impl Writeable for OnchainRequest {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
 		self.aggregation.write(writer)?;

lightning/src/chain/onchaintx.rs

@@ -367,7 +367,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		};
 		log_trace!(logger, "Updating claims view at height {} with {} matched transactions and {} claim requests", height, txn_matched.len(), requests.len());
 		let mut preprocessed_requests = Vec::with_capacity(requests.len());
-		let mut aggregated_request = OnchainRequest::default();
+		let mut aggregated_request = None;
 
 		// Try to aggregate outputs if their timelock expiration isn't imminent (absolute_timelock
 		// <= CLTV_SHARED_CLAIM_BUFFER) and they don't require an immediate nLockTime (aggregable).
@@ -378,12 +378,16 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 				if req.absolute_timelock <= height + CLTV_SHARED_CLAIM_BUFFER || !req.aggregation {
 					// Don't aggregate if outpoint absolute timelock is soon or marked as non-aggregable
 					preprocessed_requests.push(req);
+				} else if aggregated_request.is_none() {
+					aggregated_request = Some(req);
 				} else {
-					aggregated_request.request_merge(req);
+					aggregated_request.as_mut().unwrap().request_merge(req);
 				}
 			}
 		}
-		preprocessed_requests.push(aggregated_request);
+		if let Some(req) = aggregated_request {
+			preprocessed_requests.push(req);
+		}
 
 		// Generate claim transactions and track them to bump if necessary at
 		// height timer expiration (i.e in how many blocks we're going to take action).