projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
21a9024
)
Address new rustc warnings.
author
Matt Corallo
<git@bluematt.me>
Fri, 24 Apr 2020 18:40:01 +0000
(14:40 -0400)
committer
Matt Corallo
<git@bluematt.me>
Fri, 24 Apr 2020 20:55:09 +0000
(16:55 -0400)
lightning/src/ln/channel.rs
patch
|
blob
|
history
diff --git
a/lightning/src/ln/channel.rs
b/lightning/src/ln/channel.rs
index f44109432a581c2f28a7b3797cc187d24546ed31..740f67584deceaad3c2463687a8ccef24520f841 100644
(file)
--- a/
lightning/src/ln/channel.rs
+++ b/
lightning/src/ln/channel.rs
@@
-207,8
+207,8
@@
enum ChannelState {
/// to drop us, but we store this anyway.
ShutdownComplete = 4096,
}
/// to drop us, but we store this anyway.
ShutdownComplete = 4096,
}
-const BOTH_SIDES_SHUTDOWN_MASK: u32 =
(ChannelState::LocalShutdownSent as u32 | ChannelState::RemoteShutdownSent as u32)
;
-const MULTI_STATE_FLAGS: u32 =
(BOTH_SIDES_SHUTDOWN_MASK | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32)
;
+const BOTH_SIDES_SHUTDOWN_MASK: u32 =
ChannelState::LocalShutdownSent as u32 | ChannelState::RemoteShutdownSent as u32
;
+const MULTI_STATE_FLAGS: u32 =
BOTH_SIDES_SHUTDOWN_MASK | ChannelState::PeerDisconnected as u32 | ChannelState::MonitorUpdateFailed as u32
;
const INITIAL_COMMITMENT_NUMBER: u64 = (1 << 48) - 1;
const INITIAL_COMMITMENT_NUMBER: u64 = (1 << 48) - 1;
@@
-382,7
+382,7
@@
pub const COMMITMENT_TX_WEIGHT_PER_HTLC: u64 = 172;
/// Maximmum `funding_satoshis` value, according to the BOLT #2 specification
/// it's 2^24.
/// Maximmum `funding_satoshis` value, according to the BOLT #2 specification
/// it's 2^24.
-pub const MAX_FUNDING_SATOSHIS: u64 =
(1 << 24)
;
+pub const MAX_FUNDING_SATOSHIS: u64 =
1 << 24
;
/// Used to return a simple Error back to ChannelManager. Will get converted to a
/// msgs::ErrorAction::SendErrorMessage or msgs::ErrorAction::IgnoreError as appropriate with our
/// Used to return a simple Error back to ChannelManager. Will get converted to a
/// msgs::ErrorAction::SendErrorMessage or msgs::ErrorAction::IgnoreError as appropriate with our