f from_impl

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -968,7 +968,7 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 	/// For lockorder enforcement purposes, we need to have a single site which constructs the
 	/// `inner` mutex, otherwise cases where we lock two monitors at the same time (eg in our
 	/// PartialEq implementation) we may decide a lockorder violation has occurred.
-	fn construct_monitor(imp: ChannelMonitorImpl<Signer>) -> Self {
+	fn from_impl(imp: ChannelMonitorImpl<Signer>) -> Self {
 		ChannelMonitor { inner: Mutex::new(imp) }
 	}
 
@@ -1019,7 +1019,7 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 		let mut outputs_to_watch = HashMap::new();
 		outputs_to_watch.insert(funding_info.0.txid, vec![(funding_info.0.index as u32, funding_info.1.clone())]);
 
-		Self::construct_monitor(ChannelMonitorImpl {
+		Self::from_impl(ChannelMonitorImpl {
 			latest_update_id: 0,
 			commitment_transaction_number_obscure_factor,
 
@@ -3366,7 +3366,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 		let mut secp_ctx = Secp256k1::new();
 		secp_ctx.seeded_randomize(&keys_manager.get_secure_random_bytes());
 
-		Ok((best_block.block_hash(), ChannelMonitor::construct_monitor(ChannelMonitorImpl {
+		Ok((best_block.block_hash(), ChannelMonitor::from_impl(ChannelMonitorImpl {
 			latest_update_id,
 			commitment_transaction_number_obscure_factor,