feat(nom5): modify format of array from [...] to [a; b]

Author: NamsooCho

src/toxcore/dht/daemon_state.rs

@@ -142,14 +142,18 @@ mod tests {
         let serialized_vec = DaemonState::serialize_old(&alice);
         let serialized_len = serialized_vec.len();
         let res = DaemonState::deserialize_old(&alice, &serialized_vec[..serialized_len - 1]).wait();
-        res.err().unwrap();
+        let error = res.err().unwrap();
+        let mut input = vec![2, 1, 2, 3, 4, 4, 210];
+        input.extend_from_slice(&pk_org.0[..PUBLICKEYBYTES - 1]);
+        assert_eq!(*error.kind(), DeserializeErrorKind::Deserialize { error: Err::Error((
+            input, NomErrorKind::Eof)), data: serialized_vec[..serialized_len - 1].to_vec() });
 
         // test with serialized data corrupted
         let serialized_vec = [42; 10];
         let res = DaemonState::deserialize_old(&alice, &serialized_vec).wait();
         let error = res.err().unwrap();
         assert_eq!(*error.kind(), DeserializeErrorKind::Deserialize { error: Err::Error((
-            vec![42, 42, 42, 42, 42, 42, 42, 42, 42, 42], NomErrorKind::Tag)), data: serialized_vec.to_vec() });
+            vec![42; 10], NomErrorKind::Tag)), data: serialized_vec.to_vec() });
 
         // test with empty close list
         alice.close_nodes.write().remove(&pk_org);

src/toxcore/dht/packet/cookie.rs

@@ -234,10 +234,7 @@ mod tests {
         let decoded_payload = invalid_encrypted_cookie.get_payload(&symmetric_key);
         let error = decoded_payload.err().unwrap();
         assert_eq!(*error.kind(), GetPayloadErrorKind::Deserialize {
-            error: Err::Error((vec![42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
-                                    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
-                                    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
-                                    42, 42, 42], ErrorKind::Eof)),
+            error: Err::Error((vec![42; 51], ErrorKind::Eof)),
             payload: invalid_payload.to_vec()
         });
         // Try short incomplete array

src/toxcore/dht/packet/cookie_response.rs

@@ -213,7 +213,7 @@ mod tests {
         let decoded_payload = invalid_packet.get_payload(&shared_secret);
         let error = decoded_payload.err().unwrap();
         assert_eq!(*error.kind(), GetPayloadErrorKind::Deserialize {
-            error: Err::Error((vec![42, 42, 42], ErrorKind::Eof)),
+            error: Err::Error((vec![42; 3], ErrorKind::Eof)),
             payload: invalid_payload.to_vec()
         });
         // Try short incomplete array

src/toxcore/onion/packet/onion_announce_response.rs

@@ -139,7 +139,8 @@ impl FromBytes for OnionAnnounceResponsePayload {
         announce_status: call!(AnnounceStatus::from_bytes) >>
         ping_id_or_pk: call!(sha256::Digest::from_bytes) >>
         nodes: many0!(PackedNode::from_bytes) >>
-        cond!(nodes.len() <= 4, eof!()) >>
+        _len: verify!(value!(nodes.len()), |len| *len <= 4 as usize) >>
+        eof!() >>
         (OnionAnnounceResponsePayload {
             announce_status,
             ping_id_or_pk,

src/toxcore/tcp/codec.rs

@@ -1,7 +1,7 @@
 /*! Codec implementation for encoding/decoding TCP Packets in terms of tokio-io
 */
 
-use std::io::{Error as IoError};
+use std::io::Error as IoError;
 
 use crate::toxcore::binary_io::*;
 use crate::toxcore::tcp::packet::*;
@@ -113,7 +113,7 @@ impl Decoder for Codec {
         let (consumed, encrypted_packet) = match EncryptedPacket::from_bytes(buf) {
             Err(Err::Incomplete(_)) => return Ok(None),
             Err(Err::Error(_)) => return Ok(None),
-            Err(Err::Failure(_)) => return Ok(None),
+            Err(Err::Failure(e)) => return Err(DecodeError::DeserializeEncryptedError { error: e.1, buf: buf.to_vec() }.into()),
             Ok((i, encrypted_packet)) => {
                 (buf.offset(i), encrypted_packet)
             }