- let len = slice_to_be16(get_slice!($data, $read_pos, 2));
- let raw = get_slice!($data, $read_pos, len);
- let cb = decode_msg!($MsgType, raw).encode();
- assert_eq!(&raw[..cb.len()], &cb[..]);
- }
- }
-}
-
-#[macro_export]
-macro_rules! decode_msg {
- ($MsgType: path, $data: expr) => {
- match <($MsgType)>::decode($data) {
- Ok(msg) => msg,
- Err(e) => match e {
- msgs::DecodeError::UnknownRealmByte => return,
- msgs::DecodeError::BadPublicKey => return,
- msgs::DecodeError::BadSignature => return,
- msgs::DecodeError::ExtraAddressesPerType => return,
- msgs::DecodeError::WrongLength => return,
+ if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
+ let enc = msg.encode();
+ assert_eq!(&$data[..enc.len()], &enc[..]);