Use `signer` instead of `keys_storage` in OnchainTx to hold `Sign`

[rust-lightning] / lightning / src / util / macro_logger.rs

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index 222964b0a90480dfc9bf8761dfeca579f1e5c827..ab2b6ceea797235e149d7a8b6a2e50103f45494a 100644 (file)
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -138,10 +138,10 @@ impl<'a> std::fmt::Display for DebugSpendable<'a> {
                        &SpendableOutputDescriptor::StaticOutput { ref outpoint, .. } => {
                                write!(f, "StaticOutput {}:{} marked for spending", outpoint.txid, outpoint.index)?;
                        }
-                       &SpendableOutputDescriptor::DynamicOutputP2WSH(ref descriptor) => {
-                               write!(f, "DynamicOutputP2WSH {}:{} marked for spending", descriptor.outpoint.txid, descriptor.outpoint.index)?;
+                       &SpendableOutputDescriptor::DelayedPaymentOutput(ref descriptor) => {
+                               write!(f, "DelayedPaymentOutput {}:{} marked for spending", descriptor.outpoint.txid, descriptor.outpoint.index)?;
                        }
-                       &SpendableOutputDescriptor::StaticOutputCounterpartyPayment(ref descriptor) => {
+                       &SpendableOutputDescriptor::StaticPaymentOutput(ref descriptor) => {
                                write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", descriptor.outpoint.txid, descriptor.outpoint.index)?;
                        }
                }
@@ -155,12 +155,17 @@ macro_rules! log_spendable {
        }
 }
 
+/// Create a new Record and log it. You probably don't want to use this macro directly,
+/// but it needs to be exported so `log_trace` etc can use it in external crates.
+#[macro_export]
 macro_rules! log_internal {
        ($logger: expr, $lvl:expr, $($arg:tt)+) => (
-               $logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+               $logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
        );
 }
 
+/// Log an error.
+#[macro_export]
 macro_rules! log_error {
        ($logger: expr, $($arg:tt)*) => (
                #[cfg(not(any(feature = "max_level_off")))]
@@ -189,6 +194,8 @@ macro_rules! log_debug {
        )
 }
 
+/// Log a trace log.
+#[macro_export]
 macro_rules! log_trace {
        ($logger: expr, $($arg:tt)*) => (
                #[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]