projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #374 from dongcarl/2019-08-channel-open-sanity
[rust-lightning]
/
src
/
ln
/
msgs.rs
diff --git
a/src/ln/msgs.rs
b/src/ln/msgs.rs
index 6c910865388d965e69f7c92ba6f91d10d5e9d04a..0e6c4b95ee32645d4e43a5ead08331e99d4784f6 100644
(file)
--- a/
src/ln/msgs.rs
+++ b/
src/ln/msgs.rs
@@
-63,23
+63,19
@@
impl LocalFeatures {
#[cfg(not(feature = "fuzztarget"))]
pub(crate) fn new() -> LocalFeatures {
LocalFeatures {
#[cfg(not(feature = "fuzztarget"))]
pub(crate) fn new() -> LocalFeatures {
LocalFeatures {
- flags: vec![
1 << 4
],
+ flags: vec![
2 | 1 << 5
],
}
}
#[cfg(feature = "fuzztarget")]
pub fn new() -> LocalFeatures {
LocalFeatures {
}
}
#[cfg(feature = "fuzztarget")]
pub fn new() -> LocalFeatures {
LocalFeatures {
- flags: vec![
1 << 4
],
+ flags: vec![
2 | 1 << 5
],
}
}
pub(crate) fn supports_data_loss_protect(&self) -> bool {
self.flags.len() > 0 && (self.flags[0] & 3) != 0
}
}
}
pub(crate) fn supports_data_loss_protect(&self) -> bool {
self.flags.len() > 0 && (self.flags[0] & 3) != 0
}
- pub(crate) fn requires_data_loss_protect(&self) -> bool {
- self.flags.len() > 0 && (self.flags[0] & 1) != 0
- }
-
pub(crate) fn initial_routing_sync(&self) -> bool {
self.flags.len() > 0 && (self.flags[0] & (1 << 3)) != 0
}
pub(crate) fn initial_routing_sync(&self) -> bool {
self.flags.len() > 0 && (self.flags[0] & (1 << 3)) != 0
}
@@
-94,8
+90,9
@@
impl LocalFeatures {
pub(crate) fn supports_upfront_shutdown_script(&self) -> bool {
self.flags.len() > 0 && (self.flags[0] & (3 << 4)) != 0
}
pub(crate) fn supports_upfront_shutdown_script(&self) -> bool {
self.flags.len() > 0 && (self.flags[0] & (3 << 4)) != 0
}
+ #[cfg(test)]
pub(crate) fn unset_upfront_shutdown_script(&mut self) {
pub(crate) fn unset_upfront_shutdown_script(&mut self) {
- self.flags[0] ^= 1 <<
4
;
+ self.flags[0] ^= 1 <<
5
;
}
pub(crate) fn requires_unknown_bits(&self) -> bool {
}
pub(crate) fn requires_unknown_bits(&self) -> bool {
@@
-713,7
+710,6
@@
mod fuzzy_internal_msgs {
pub(crate) data: OnionRealm0HopData,
pub(crate) hmac: [u8; 32],
}
pub(crate) data: OnionRealm0HopData,
pub(crate) hmac: [u8; 32],
}
- unsafe impl ::util::internal_traits::NoDealloc for OnionHopData{}
pub struct DecodedOnionErrorPacket {
pub(crate) hmac: [u8; 32],
pub struct DecodedOnionErrorPacket {
pub(crate) hmac: [u8; 32],
@@
-2018,9
+2014,9
@@
mod tests {
target_value.append(&mut hex::decode("0000").unwrap());
}
if initial_routing_sync {
target_value.append(&mut hex::decode("0000").unwrap());
}
if initial_routing_sync {
- target_value.append(&mut hex::decode("0001
18
").unwrap());
+ target_value.append(&mut hex::decode("0001
2a
").unwrap());
} else {
} else {
- target_value.append(&mut hex::decode("0001
10
").unwrap());
+ target_value.append(&mut hex::decode("0001
22
").unwrap());
}
assert_eq!(encoded_value, target_value);
}
}
assert_eq!(encoded_value, target_value);
}