f avoid inputs/outputs clone when building tx

Author: dunxen

lightning/src/ln/interactivetxs.rs

@@ -331,22 +331,6 @@ impl NegotiationContext {
 			return Err(AbortReason::ExceededNumberOfInputsOrOutputs);
 		}
 
-		// Inputs and outputs must be sorted by serial_id
-		let mut inputs = self.inputs.iter().collect::<Vec<_>>();
-		let mut outputs = self.outputs.iter().collect::<Vec<_>>();
-		inputs.sort_unstable_by_key(|(serial_id, _)| *serial_id);
-		outputs.sort_unstable_by_key(|(serial_id, _)| *serial_id);
-
-		let tx_to_validate = Transaction {
-			version: 2,
-			lock_time: self.tx_locktime,
-			input: inputs.into_iter().map(|(_, input)| input.input.clone()).collect(),
-			output: outputs.into_iter().map(|(_, output)| output.clone()).collect(),
-		};
-		if tx_to_validate.weight().to_wu() > MAX_STANDARD_TX_WEIGHT as u64 {
-			return Err(AbortReason::TransactionTooLarge);
-		}
-
 		// TODO: How do we enforce their fees cover the witness without knowing its expected length?
 		const INPUT_WEIGHT: u64 = BASE_INPUT_WEIGHT + EMPTY_SCRIPT_SIG_WEIGHT;
 
@@ -379,6 +363,22 @@ impl NegotiationContext {
 			return Err(AbortReason::InsufficientFees);
 		}
 
+		// Inputs and outputs must be sorted by serial_id
+		let mut inputs = self.inputs.into_iter().collect::<Vec<_>>();
+		let mut outputs = self.outputs.into_iter().collect::<Vec<_>>();
+		inputs.sort_unstable_by_key(|(serial_id, _)| *serial_id);
+		outputs.sort_unstable_by_key(|(serial_id, _)| *serial_id);
+
+		let tx_to_validate = Transaction {
+			version: 2,
+			lock_time: self.tx_locktime,
+			input: inputs.into_iter().map(|(_, input)| input.input).collect(),
+			output: outputs.into_iter().map(|(_, output)| output).collect(),
+		};
+		if tx_to_validate.weight().to_wu() > MAX_STANDARD_TX_WEIGHT as u64 {
+			return Err(AbortReason::TransactionTooLarge);
+		}
+
 		Ok(tx_to_validate)
 	}
 }