-f verb_object naming

Author: Antoine Riard

lightning/src/ln/onchain_utils.rs

@@ -298,7 +298,7 @@ impl PackageTemplate {
 			},
 		}
 	}
-	pub(crate) fn package_split(&mut self, outp: &BitcoinOutPoint) -> Option<PackageTemplate> {
+	pub(crate) fn split_package(&mut self, outp: &BitcoinOutPoint) -> Option<PackageTemplate> {
 		match self {
 			PackageTemplate::MalleableJusticeTx { ref mut inputs } => {
 				if let Some(removed) = inputs.remove(outp) {
@@ -330,7 +330,7 @@ impl PackageTemplate {
 			}
 		}
 	}
-	pub(crate) fn package_merge(&mut self, mut template: PackageTemplate) {
+	pub(crate) fn merge_package(&mut self, mut template: PackageTemplate) {
 		match self {
 			PackageTemplate::MalleableJusticeTx { ref mut inputs } => {
 				let base_inputs = inputs;
@@ -420,7 +420,7 @@ impl PackageTemplate {
 		};
 		bumped_tx.get_weight() + witnesses_weight
 	}
-	pub(crate) fn package_finalize<L: Deref, Signer: Sign>(&self, onchain_handler: &mut OnchainTxHandler<Signer>, value: u64, destination_script: Script, logger: &L) -> Option<Transaction>
+	pub(crate) fn finalize_package<L: Deref, Signer: Sign>(&self, onchain_handler: &mut OnchainTxHandler<Signer>, value: u64, destination_script: Script, logger: &L) -> Option<Transaction>
 		where L::Target: Logger,
 	{
 		let mut bumped_tx = Transaction {
@@ -749,7 +749,7 @@ impl OnchainRequest {
 		if self.absolute_timelock > req.absolute_timelock {
 			self.absolute_timelock = req.absolute_timelock;
 		}
-		self.content.package_merge(req.content);
+		self.content.merge_package(req.content);
 	}
 }
 

lightning/src/ln/onchaintx.rs

@@ -339,13 +339,13 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 			if let Some((output_value, new_feerate)) = onchain_utils::compute_output_value(predicted_weight, amt, cached_request.feerate_previous, fee_estimator, logger) {
 				assert!(new_feerate != 0);
 
-				let transaction = cached_request.content.package_finalize(self, output_value, self.destination_script.clone(), logger).unwrap();
+				let transaction = cached_request.content.finalize_package(self, output_value, self.destination_script.clone(), logger).unwrap();
 				log_trace!(logger, "...with timer {} and feerate {}", new_timer.unwrap(), new_feerate);
 				assert!(predicted_weight >= transaction.get_weight());
 				return Some((new_timer, new_feerate, transaction))
 			}
 		} else {
-			if let Some(transaction) = cached_request.content.package_finalize(self, amt, self.destination_script.clone(), logger) {
+			if let Some(transaction) = cached_request.content.finalize_package(self, amt, self.destination_script.clone(), logger) {
 				return Some((None, 0, transaction));
 			}
 		}
@@ -448,7 +448,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 						} else { // If false, generate new claim request with update outpoint set
 							let mut at_least_one_drop = false;
 							for input in tx.input.iter() {
-								if let Some(package) = request.content.package_split(&input.previous_output) {
+								if let Some(package) = request.content.split_package(&input.previous_output) {
 									claimed_outputs_material.push(package);
 									at_least_one_drop = true;
 								}
@@ -540,7 +540,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 					OnchainEvent::ContentiousOutpoint { package } => {
 						if let Some(ancestor_claimable_txid) = self.claimable_outpoints.get(&package.outpoints()[0]) {
 							if let Some(request) = self.pending_claim_requests.get_mut(&ancestor_claimable_txid.0) {
-								request.content.package_merge(package);
+								request.content.merge_package(package);
 								// Using a HashMap guarantee us than if we have multiple outpoints getting
 								// resurrected only one bump claim tx is going to be broadcast
 								bump_candidates.insert(ancestor_claimable_txid.clone(), request.clone());