projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
De-Option<> some fields in ChannelMonitor which are set at init
[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..bee0f0d26f9a68e3ea4b00635ddd3994781c28c0 100644
(file)
--- a/
lightning/src/util/macro_logger.rs
+++ b/
lightning/src/util/macro_logger.rs
@@
-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 {