-f Switch to package_amount

Author: Antoine Riard

lightning/src/ln/onchain_utils.rs

@@ -357,7 +357,7 @@ impl PackageTemplate {
 			_ => panic!("Merging template on non-malleable packages")
 		}
 	}
-	pub(crate) fn package_amounts(&self) -> u64 {
+	pub(crate) fn package_amount(&self) -> u64 {
 		let amounts = match self {
 			PackageTemplate::MalleableJusticeTx { ref inputs } => {
 				let mut amounts = 0;

lightning/src/ln/onchaintx.rs

@@ -333,7 +333,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		// Compute new height timer to decide when we need to regenerate a new bumped version of the claim tx (if we
 		// didn't receive confirmation of it before, or not enough reorg-safe depth on top of it).
 		let new_timer = Some(Self::get_height_timer(height, cached_request.absolute_timelock));
-		let amt = cached_request.content.package_amounts();
+		let amt = cached_request.content.package_amount();
 		if cached_request.bump_strategy == BumpStrategy::RBF {
 			let predicted_weight = cached_request.content.package_weight(&self.destination_script);
 			if let Some((output_value, new_feerate)) = onchain_utils::compute_output_value(predicted_weight, amt, cached_request.feerate_previous, fee_estimator, logger) {