mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nix-compat): drop read_bytes_unchecked

Browse source 
This isn't used anywhere so far, and if someone really wants to, they
can simply make the range open-ended.

Change-Id: Iae9bcaa1f7ea032dd3ee76c8c142a38b6b72894d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11373
Reviewed-by: picnoir picnoir <picnoir@alternativebit.fr>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-04-08 00:14:39 +03:00 committed by flokli
parent d00c75ea9c
commit f6359bf91f
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
tvix/nix-compat/src/wire/bytes.rs
View file

@ -102,15 +102,6 @@ pub async fn write_bytes<W: AsyncWriteExt + Unpin>(w: &mut W, b: &[u8]) -> std::
Ok(()) Ok(())
} }
#[allow(dead_code)]
/// Read an unlimited number of bytes from the AsyncRead.
/// Note this can exhaust memory.
/// Internally uses [read_bytes], which takes care of dealing with the padding,
/// so the returned `Vec<u8>` only contains the payload.
pub async fn read_bytes_unchecked<R: AsyncReadExt + Unpin>(r: &mut R) -> std::io::Result<Vec<u8>> {
read_bytes(r, 0u64..).await
}
/// Computes the number of bytes we should add to len (a length in /// Computes the number of bytes we should add to len (a length in
/// bytes) to be alined on 64 bits (8 bytes). /// bytes) to be alined on 64 bits (8 bytes).
pub(crate) fn padding_len(len: u64) -> u8 { pub(crate) fn padding_len(len: u64) -> u8 {
@ -129,8 +120,12 @@ mod tests {
use super::*; use super::*;
use hex_literal::hex; use hex_literal::hex;
/// The maximum length of bytes packets we're willing to accept in the test
/// cases.
const MAX_LEN: u64 = 1024;
#[tokio::test] #[tokio::test]
async fn test_read_8_bytes_unchecked() { async fn test_read_8_bytes() {
let mut mock = Builder::new() let mut mock = Builder::new()
.read(&8u64.to_le_bytes()) .read(&8u64.to_le_bytes())
.read(&12345678u64.to_le_bytes()) .read(&12345678u64.to_le_bytes())
@ -138,12 +133,15 @@ mod tests {
assert_eq!( assert_eq!(
&12345678u64.to_le_bytes(), &12345678u64.to_le_bytes(),
read_bytes_unchecked(&mut mock).await.unwrap().as_slice() read_bytes(&mut mock, 0u64..MAX_LEN)
.await
.unwrap()
.as_slice()
); );
} }
#[tokio::test] #[tokio::test]
async fn test_read_9_bytes_unchecked() { async fn test_read_9_bytes() {
let mut mock = Builder::new() let mut mock = Builder::new()
.read(&9u64.to_le_bytes()) .read(&9u64.to_le_bytes())
.read(&hex!("01020304050607080900000000000000")) .read(&hex!("01020304050607080900000000000000"))
@ -151,19 +149,25 @@ mod tests {
assert_eq!( assert_eq!(
hex!("010203040506070809"), hex!("010203040506070809"),
read_bytes_unchecked(&mut mock).await.unwrap().as_slice() read_bytes(&mut mock, 0u64..MAX_LEN)
.await
.unwrap()
.as_slice()
); );
} }
#[tokio::test] #[tokio::test]
async fn test_read_0_bytes_unchecked() { async fn test_read_0_bytes() {
// A empty byte packet is essentially just the 0 length field. // A empty byte packet is essentially just the 0 length field.
// No data is read, and there's zero padding. // No data is read, and there's zero padding.
let mut mock = Builder::new().read(&0u64.to_le_bytes()).build(); let mut mock = Builder::new().read(&0u64.to_le_bytes()).build();
assert_eq!( assert_eq!(
hex!(""), hex!(""),
read_bytes_unchecked(&mut mock).await.unwrap().as_slice() read_bytes(&mut mock, 0u64..MAX_LEN)
.await
.unwrap()
.as_slice()
); );
} }