diff --git a/TODO.md b/TODO.md index 03c8fc2..3760c6e 100644 --- a/TODO.md +++ b/TODO.md @@ -33,7 +33,6 @@ scrape requests I suppose. ## aquatic_ws -* update tests for simd-json * config: multiple request workers * test transfer again with changes made: * crossbeam-channel diff --git a/aquatic_ws_protocol/src/lib.rs b/aquatic_ws_protocol/src/lib.rs index 479ac4a..e831b4b 100644 --- a/aquatic_ws_protocol/src/lib.rs +++ b/aquatic_ws_protocol/src/lib.rs @@ -565,10 +565,10 @@ mod tests { #[test] fn test_deserialize_info_hashes_vec(){ - let input = r#"{ + let mut input: String = r#"{ "action": "scrape", "info_hash": ["aaaabbbbccccddddeeee", "aaaabbbbccccddddeeee"] - }"#; + }"#.into(); let info_hashes = ScrapeRequestInfoHashes::Multiple( vec![ @@ -582,17 +582,17 @@ mod tests { info_hashes: Some(info_hashes) }; - let observed: ScrapeRequest = serde_json::from_str(input).unwrap(); + let observed: ScrapeRequest = ::simd_json::serde::from_str(&mut input).unwrap(); assert_eq!(expected, observed); } #[test] fn test_deserialize_info_hashes_str(){ - let input = r#"{ + let mut input: String = r#"{ "action": "scrape", "info_hash": "aaaabbbbccccddddeeee" - }"#; + }"#.into(); let info_hashes = ScrapeRequestInfoHashes::Single( info_hash_from_bytes(b"aaaabbbbccccddddeeee") @@ -603,51 +603,51 @@ mod tests { info_hashes: Some(info_hashes) }; - let observed: ScrapeRequest = serde_json::from_str(input).unwrap(); + let observed: ScrapeRequest = ::simd_json::serde::from_str(&mut input).unwrap(); assert_eq!(expected, observed); } #[test] fn test_deserialize_info_hashes_null(){ - let input = r#"{ + let mut input: String = r#"{ "action": "scrape", "info_hash": null - }"#; + }"#.into(); let expected = ScrapeRequest { action: ScrapeAction, info_hashes: None }; - let observed: ScrapeRequest = serde_json::from_str(input).unwrap(); + let observed: ScrapeRequest = ::simd_json::serde::from_str(&mut input).unwrap(); assert_eq!(expected, observed); } #[test] fn test_deserialize_info_hashes_missing(){ - let input = r#"{ + let mut input: String = r#"{ "action": "scrape" - }"#; + }"#.into(); let expected = ScrapeRequest { action: ScrapeAction, info_hashes: None }; - let observed: ScrapeRequest = serde_json::from_str(input).unwrap(); + let observed: ScrapeRequest = ::simd_json::serde::from_str(&mut input).unwrap(); assert_eq!(expected, observed); } #[quickcheck] fn quickcheck_serde_identity_info_hashes(info_hashes: ScrapeRequestInfoHashes) -> bool { - let json = ::serde_json::to_string(&info_hashes).unwrap(); + let mut json = ::simd_json::serde::to_string(&info_hashes).unwrap(); println!("{}", json); - let deserialized: ScrapeRequestInfoHashes = ::serde_json::from_str(&json).unwrap(); + let deserialized: ScrapeRequestInfoHashes = ::simd_json::serde::from_str(&mut json).unwrap(); let success = info_hashes == deserialized; diff --git a/aquatic_ws_protocol/src/serde_helpers.rs b/aquatic_ws_protocol/src/serde_helpers.rs index ac2b20f..7271636 100644 --- a/aquatic_ws_protocol/src/serde_helpers.rs +++ b/aquatic_ws_protocol/src/serde_helpers.rs @@ -131,20 +131,20 @@ mod tests { #[test] fn test_deserialize_20_bytes(){ - let input = r#""aaaabbbbccccddddeeee""#; + let mut input = r#""aaaabbbbccccddddeeee""#.to_string(); let expected = info_hash_from_bytes(b"aaaabbbbccccddddeeee"); - let observed: InfoHash = serde_json::from_str(input).unwrap(); + let observed: InfoHash = ::simd_json::serde::from_str(&mut input).unwrap(); assert_eq!(observed, expected); - let input = r#""aaaabbbbccccddddeee""#; - let res_info_hash: Result = serde_json::from_str(input); + let mut input = r#""aaaabbbbccccddddeee""#.to_string(); + let res_info_hash: Result = ::simd_json::serde::from_str(&mut input); assert!(res_info_hash.is_err()); - let input = r#""aaaabbbbccccddddeeeš•Š""#; - let res_info_hash: Result = serde_json::from_str(input); + let mut input = r#""aaaabbbbccccddddeeeš•Š""#.to_string(); + let res_info_hash: Result = ::simd_json::serde::from_str(&mut input); assert!(res_info_hash.is_err()); } @@ -153,16 +153,16 @@ mod tests { fn test_serde_20_bytes(){ let info_hash = info_hash_from_bytes(b"aaaabbbbccccddddeeee"); - let out = serde_json::to_string(&info_hash).unwrap(); - let info_hash_2 = serde_json::from_str(&out).unwrap(); + let mut out = ::simd_json::serde::to_string(&info_hash).unwrap(); + let info_hash_2 = ::simd_json::serde::from_str(&mut out).unwrap(); assert_eq!(info_hash, info_hash_2); } #[quickcheck] fn quickcheck_serde_20_bytes(info_hash: InfoHash) -> bool { - let out = serde_json::to_string(&info_hash).unwrap(); - let info_hash_2 = serde_json::from_str(&out).unwrap(); + let mut out = ::simd_json::serde::to_string(&info_hash).unwrap(); + let info_hash_2 = ::simd_json::serde::from_str(&mut out).unwrap(); info_hash == info_hash_2 }