use lightning::ln::router::{Router, RouteHint};
use lightning::util::reset_rng_state;
use lightning::util::logger::Logger;
-use lightning::util::ser::{Reader, Readable};
+use lightning::util::ser::Readable;
use secp256k1::key::PublicKey;
use secp256k1::Secp256k1;
macro_rules! decode_msg {
($MsgType: path, $len: expr) => {{
- let mut reader = Reader::new(::std::io::Cursor::new(get_slice!($len)));
+ let mut reader = ::std::io::Cursor::new(get_slice!($len));
match <($MsgType)>::read(&mut reader) {
Ok(msg) => msg,
Err(e) => match e {
- msgs::DecodeError::UnknownRealmByte => return,
+ msgs::DecodeError::UnknownVersion => return,
msgs::DecodeError::UnknownRequiredFeature => return,
- msgs::DecodeError::BadPublicKey => return,
- msgs::DecodeError::BadSignature => return,
- msgs::DecodeError::BadText => return,
+ msgs::DecodeError::InvalidValue => return,
msgs::DecodeError::ExtraAddressesPerType => return,
msgs::DecodeError::BadLengthDescriptor => return,
msgs::DecodeError::ShortRead => panic!("We picked the length..."),
- msgs::DecodeError::InvalidValue => panic!("Should not happen with p2p message decoding"),
msgs::DecodeError::Io(e) => panic!(format!("{}", e)),
}
}