use dyn logger in LoggerScope

Author: joostjager

lightning/src/routing/gossip.rs

@@ -41,7 +41,7 @@ use crate::util::async_poll::{MaybeSend, MaybeSync};
 use crate::util::indexed_map::{
 	Entry as IndexedMapEntry, IndexedMap, OccupiedEntry as IndexedMapOccupiedEntry,
 };
-use crate::util::logger::{Level, Logger};
+use crate::util::logger::{Level, Logger, LoggerScope};
 use crate::util::scid_utils::{block_from_scid, scid_from_parts, MAX_SCID_BLOCK};
 use crate::util::ser::{MaybeReadable, Readable, ReadableArgs, RequiredWrapper, Writeable, Writer};
 
@@ -1843,6 +1843,8 @@ where
 	/// The unix timestamp provided by the most recent rapid gossip sync.
 	/// It will be set by the rapid sync process after every sync completion.
 	pub fn get_last_rapid_gossip_sync_timestamp(&self) -> Option<u32> {
+		let _scope = LoggerScope::new(&*self.logger); // DOES NOT WORK.
+
 		self.last_rapid_gossip_sync_timestamp.lock().unwrap().clone()
 	}
 

lightning/src/util/logger.rs

@@ -271,7 +271,7 @@ pub struct LoggerScope<'a> {
 }
 
 impl<'a> LoggerScope<'a> {
-	pub fn new<L: Logger + 'a>(logger: &'a L) -> Self {
+	pub fn new(logger: &'a dyn Logger) -> Self {
 		TLS_LOGGER.with(|cell| {
 			let mut borrow = cell.borrow_mut();
 
@@ -280,11 +280,8 @@ impl<'a> LoggerScope<'a> {
 				panic!("LoggerScope already active in this thread");
 			}
 
-			// Transmute is safe in practice because the RAII pattern ensures:
-			// - The TLS logger reference is only used while the guard exists.
-			// - The guard cannot outlive the logger (thanks to PhantomData<'a>).
-			let logger_ref: &dyn Logger = logger;
-			let logger_ref_static: &'static dyn Logger = unsafe { std::mem::transmute(logger_ref) };
+			let logger_ref_static: &'static dyn Logger =
+				unsafe { std::mem::transmute::<&'a dyn Logger, &'static dyn Logger>(logger) };
 
 			*borrow = Some(logger_ref_static);
 		});

lightning/src/util/persist.rs

@@ -35,7 +35,7 @@ use crate::ln::types::ChannelId;
 use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, SignerProvider};
 use crate::sync::Mutex;
 use crate::util::async_poll::{dummy_waker, AsyncResult, MaybeSend, MaybeSync};
-use crate::util::logger::{Logger, LoggerScope};
+use crate::util::logger::Logger;
 use crate::util::native_async::FutureSpawner;
 use crate::util::ser::{Readable, ReadableArgs, Writeable};
 use crate::util::wakers::Notifier;
@@ -1063,7 +1063,6 @@ where
 				Err(err) => return Err(err),
 			};
 
-			// let _scope = LoggerScope::new(&*self.logger); // DOES NOT WORK
 			monitor
 				.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger)
 				.map_err(|e| {