feat(nom5): Use MAX_SHARED_RELAYS

Author: NamsooCho

src/toxcore/dht/packet/crypto_data.rs

@@ -148,9 +148,7 @@ impl ToBytes for CryptoDataPayload {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use nom::{Err,
-        error::ErrorKind
-    };
+    use nom::{Err, error::ErrorKind};
 
     encode_decode_test!(
         crypto_data_encode_decode,

src/toxcore/friend_connection/packet/share_relays.rs

@@ -32,7 +32,7 @@ impl FromBytes for ShareRelays {
     named!(from_bytes<ShareRelays>, do_parse!(
         tag!(&[PACKET_ID_SHARE_RELAYS][..]) >>
         relays: many0!(PackedNode::from_tcp_bytes) >>
-        verify!(value!(relays.len()), |len| *len <= 3) >>
+        verify!(value!(relays.len()), |len| *len <= MAX_SHARED_RELAYS) >>
         (ShareRelays {
             relays,
         })

src/toxcore/onion/packet/onion_request_2.rs

@@ -42,11 +42,8 @@ impl FromBytes for OnionRequest2 {
         tag!(&[0x82][..]) >>
         nonce: call!(Nonce::from_bytes) >>
         temporary_pk: call!(PublicKey::from_bytes) >>
-        rest_len: rest_len >>
-        payload: map_opt!(cond!(
-            rest_len >= ONION_RETURN_2_SIZE,
-            take!(rest_len - ONION_RETURN_2_SIZE)
-        ), |payload| payload) >>
+        rest_len: verify!(rest_len, |rest_len| *rest_len >= ONION_RETURN_2_SIZE) >>
+        payload: take!(rest_len - ONION_RETURN_2_SIZE) >>
         onion_return: call!(OnionReturn::from_bytes) >>
         (OnionRequest2 {
             nonce,