X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fmsgs.rs;h=259f90d7d1040de44443a11c0c116db253c04e71;hb=df11c05fa6281c3825f2fb9f3260b94c56c77afb;hp=520fe5f0f7eaa9d8466e8131882c2eabbab399fc;hpb=6185a2819090bd077954244c5e2adaab5efcaa1a;p=rust-lightning diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs index 520fe5f0..259f90d7 100644 --- 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 { - 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); } - 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); } @@ -873,7 +873,7 @@ impl MsgDecodable for OnionHopData { 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, }) }