projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make TxCreationKeys public and wrap it in PreCalculatedTxCreationKeys
[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 1f9cb1ad27e62d21f916272be115deca7d26710d..01038646f2b5dcafaee30e059a0c4fa115c369ee 100644
(file)
--- a/
lightning/src/util/macro_logger.rs
+++ b/
lightning/src/util/macro_logger.rs
@@
-1,11
+1,11
@@
use chain::transaction::OutPoint;
use chain::keysinterface::SpendableOutputDescriptor;
use chain::transaction::OutPoint;
use chain::keysinterface::SpendableOutputDescriptor;
-use bitcoin
_hashes::sha256d::Hash as Sha256dHash
;
+use bitcoin
::hash_types::Txid
;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::transaction::Transaction;
-use secp256k1::key::PublicKey;
+use
bitcoin::
secp256k1::key::PublicKey;
-use
ln
::router::Route;
+use
routing
::router::Route;
use ln::chan_utils::HTLCType;
use std;
use ln::chan_utils::HTLCType;
use std;
@@
-40,10
+40,10
@@
macro_rules! log_bytes {
}
}
}
}
-pub(crate) struct DebugFundingChannelId<'a>(pub &'a
Sha256dHash
, pub u16);
+pub(crate) struct DebugFundingChannelId<'a>(pub &'a
Txid
, pub u16);
impl<'a> std::fmt::Display for DebugFundingChannelId<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
impl<'a> std::fmt::Display for DebugFundingChannelId<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
- for i in
OutPoint::new(self.0.clone(), self.1
).to_channel_id().iter() {
+ for i in
(OutPoint { txid: self.0.clone(), index: self.1 }
).to_channel_id().iter() {
write!(f, "{:02x}", i)?;
}
Ok(())
write!(f, "{:02x}", i)?;
}
Ok(())
@@
-55,13
+55,10
@@
macro_rules! log_funding_channel_id {
}
}
}
}
-pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a
Option<(OutPoint, T)>
);
+pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a
(OutPoint, T)
);
impl<'a, T> std::fmt::Display for DebugFundingInfo<'a, T> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
impl<'a, T> std::fmt::Display for DebugFundingInfo<'a, T> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
- match self.0.as_ref() {
- Some(&(ref funding_output, _)) => DebugBytes(&funding_output.to_channel_id()[..]).fmt(f),
- None => write!(f, "without funding output set"),
- }
+ DebugBytes(&(self.0).0.to_channel_id()[..]).fmt(f)
}
}
macro_rules! log_funding_info {
}
}
macro_rules! log_funding_info {
@@
-135,7
+132,7
@@
impl<'a> std::fmt::Display for DebugSpendable<'a> {
&SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, .. } => {
write!(f, "DynamicOutputP2WSH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
}
&SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, .. } => {
write!(f, "DynamicOutputP2WSH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
}
- &SpendableOutputDescriptor::
DynamicOutputP2WPKH
{ ref outpoint, .. } => {
+ &SpendableOutputDescriptor::
StaticOutputRemotePayment
{ ref outpoint, .. } => {
write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
}
}
write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
}
}
@@
-150,42
+147,42
@@
macro_rules! log_spendable {
}
macro_rules! log_internal {
}
macro_rules! log_internal {
- ($
self: ident
, $lvl:expr, $($arg:tt)+) => (
-
&$self.
logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+ ($
logger: expr
, $lvl:expr, $($arg:tt)+) => (
+
$
logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
);
}
macro_rules! log_error {
);
}
macro_rules! log_error {
- ($
self: ident
, $($arg:tt)*) => (
+ ($
logger: expr
, $($arg:tt)*) => (
#[cfg(not(any(feature = "max_level_off")))]
#[cfg(not(any(feature = "max_level_off")))]
- log_internal!($
self
, $crate::util::logger::Level::Error, $($arg)*);
+ log_internal!($
logger
, $crate::util::logger::Level::Error, $($arg)*);
)
}
macro_rules! log_warn {
)
}
macro_rules! log_warn {
- ($
self: ident
, $($arg:tt)*) => (
+ ($
logger: expr
, $($arg:tt)*) => (
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
- log_internal!($
self
, $crate::util::logger::Level::Warn, $($arg)*);
+ log_internal!($
logger
, $crate::util::logger::Level::Warn, $($arg)*);
)
}
macro_rules! log_info {
)
}
macro_rules! log_info {
- ($
self: ident
, $($arg:tt)*) => (
+ ($
logger: expr
, $($arg:tt)*) => (
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
- log_internal!($
self
, $crate::util::logger::Level::Info, $($arg)*);
+ log_internal!($
logger
, $crate::util::logger::Level::Info, $($arg)*);
)
}
macro_rules! log_debug {
)
}
macro_rules! log_debug {
- ($
self: ident
, $($arg:tt)*) => (
+ ($
logger: expr
, $($arg:tt)*) => (
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
- log_internal!($
self
, $crate::util::logger::Level::Debug, $($arg)*);
+ log_internal!($
logger
, $crate::util::logger::Level::Debug, $($arg)*);
)
}
macro_rules! log_trace {
)
}
macro_rules! log_trace {
- ($
self: ident
, $($arg:tt)*) => (
+ ($
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")))]
#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
- log_internal!($
self
, $crate::util::logger::Level::Trace, $($arg)*);
+ log_internal!($
logger
, $crate::util::logger::Level::Trace, $($arg)*);
)
}
)
}