projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use ChainWatchInterfaceUtil directly in tests instead of a wrapper
[rust-lightning]
/
src
/
ln
/
msgs.rs
diff --git
a/src/ln/msgs.rs
b/src/ln/msgs.rs
index 520fe5f0f7eaa9d8466e8131882c2eabbab399fc..259f90d7d1040de44443a11c0c116db253c04e71 100644
(file)
--- a/
src/ln/msgs.rs
+++ b/
src/ln/msgs.rs
@@
-477,11
+477,11
@@
impl MsgEncodable for GlobalFeatures {
impl MsgDecodable for Init {
fn decode(v: &[u8]) -> Result<Self, DecodeError> {
impl MsgDecodable for Init {
fn decode(v: &[u8]) -> Result<Self, DecodeError> {
- let global_features =
try!(GlobalFeatures::decode(v))
;
+ let global_features =
GlobalFeatures::decode(v)?
;
if global_features.flags.len() + 4 <= v.len() {
return Err(DecodeError::WrongLength);
}
if global_features.flags.len() + 4 <= v.len() {
return Err(DecodeError::WrongLength);
}
- let local_features =
try!(LocalFeatures::decode(&v[global_features.flags.len() + 2..]))
;
+ let local_features =
LocalFeatures::decode(&v[global_features.flags.len() + 2..])?
;
if global_features.flags.len() + local_features.flags.len() + 4 != v.len() {
return Err(DecodeError::WrongLength);
}
if global_features.flags.len() + local_features.flags.len() + 4 != v.len() {
return Err(DecodeError::WrongLength);
}
@@
-873,7
+873,7
@@
impl MsgDecodable for OnionHopData {
hmac[..].copy_from_slice(&v[33..65]);
Ok(OnionHopData {
realm: realm,
hmac[..].copy_from_slice(&v[33..65]);
Ok(OnionHopData {
realm: realm,
- data:
try!(OnionRealm0HopData::decode(&v[1..33]))
,
+ data:
OnionRealm0HopData::decode(&v[1..33])?
,
hmac: hmac,
})
}
hmac: hmac,
})
}