-f Fixe tests, all good

Author: Antoine Riard

lightning/src/ln/onchain_utils.rs

@@ -332,7 +332,7 @@ impl PackageSolvingData {
 		};
 		category
 	}
-	fn add_input<Signer: Sign>(&self, bumped_tx: &mut Transaction, i: usize, onchain_handler: &mut OnchainTxHandler<Signer>) -> bool {
+	fn finalize_input<Signer: Sign>(&self, bumped_tx: &mut Transaction, i: usize, onchain_handler: &mut OnchainTxHandler<Signer>) -> bool {
 		match self {
 			PackageSolvingData::RevokedOutput(ref outp) => {
 				if let Ok(chan_keys) = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint) {
@@ -353,7 +353,6 @@ impl PackageSolvingData {
 						bumped_tx.input[i].witness.push(witness_script.clone().into_bytes());
 					} else { return false; }
 				}
-
 			},
 			PackageSolvingData::CounterpartyHTLCOutput(ref outp) => {
 				if let Ok(chan_keys) = TxCreationKeys::derive_new(&onchain_handler.secp_ctx, &outp.per_commitment_point, &outp.counterparty_delayed_payment_base_key, &outp.counterparty_htlc_base_key, &onchain_handler.signer.pubkeys().revocation_basepoint, &onchain_handler.signer.pubkeys().htlc_basepoint) {
@@ -573,15 +572,17 @@ impl PackageTemplate {
 						value,
 					}],
 				};
-				for (i, (outpoint, out)) in self.inputs.iter().enumerate() {
+				for (outpoint, _) in self.inputs.iter() {
 					bumped_tx.input.push(TxIn {
 						previous_output: *outpoint,
 						script_sig: Script::new(),
 						sequence: 0xfffffffd,
 						witness: Vec::new(),
 					});
+				}
+				for (i, (outpoint, out)) in self.inputs.iter().enumerate() {
 					log_trace!(logger, "Adding claiming input for outpoint {}:{}", outpoint.txid, outpoint.vout);
-					if !out.add_input(&mut bumped_tx, i, onchain_handler) { return None; }
+					if !out.finalize_input(&mut bumped_tx, i, onchain_handler) { return None; }
 				}
 				log_trace!(logger, "Finalized transaction {} ready to broadcast", bumped_tx.txid());
 				return Some(bumped_tx);