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

refactor(tvix/castore/digest): stop using bytes::Bytes internally

Browse source 
Change-Id: I07a13da0ae4aee4298025fca4345d738f40cfe5a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12757
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
Reviewed-by: edef <edef@edef.eu>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-10-21 14:23:18 +02:00 • committed by flokli
parent ef3a51b38d
commit 1bc092b063
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
tvix/castore/src/digests.rs
View file

@ -2,8 +2,10 @@ use bytes::Bytes;
use data_encoding::BASE64; use data_encoding::BASE64;
use thiserror::Error; use thiserror::Error;
pub const B3_LEN: usize = blake3::OUT_LEN;
#[derive(PartialEq, Eq, Hash)] #[derive(PartialEq, Eq, Hash)]
pub struct B3Digest(Bytes); pub struct B3Digest([u8; B3_LEN]);
// TODO: allow converting these errors to crate::Error // TODO: allow converting these errors to crate::Error
#[derive(Error, Debug, PartialEq)] #[derive(Error, Debug, PartialEq)]
@ -12,8 +14,6 @@ pub enum Error {
InvalidDigestLen(usize), InvalidDigestLen(usize),
} }
pub const B3_LEN: usize = 32;
impl B3Digest { impl B3Digest {
pub fn as_slice(&self) -> &[u8] { pub fn as_slice(&self) -> &[u8] {
&self.0[..] &self.0[..]
@ -22,59 +22,60 @@ impl B3Digest {
impl From<B3Digest> for bytes::Bytes { impl From<B3Digest> for bytes::Bytes {
fn from(val: B3Digest) -> Self { fn from(val: B3Digest) -> Self {
val.0 Bytes::copy_from_slice(&val.0)
} }
} }
impl From<blake3::Hash> for B3Digest { impl From<blake3::Hash> for B3Digest {
fn from(value: blake3::Hash) -> Self { fn from(value: blake3::Hash) -> Self {
Self(Bytes::copy_from_slice(value.as_bytes())) Self(*value.as_bytes())
} }
} }
impl From<digest::Output<blake3::Hasher>> for B3Digest { impl From<digest::Output<blake3::Hasher>> for B3Digest {
fn from(value: digest::Output<blake3::Hasher>) -> Self { fn from(value: digest::Output<blake3::Hasher>) -> Self {
let v = Into::<[u8; B3_LEN]>::into(value); Self(value.into())
Self(Bytes::copy_from_slice(&v))
} }
} }
impl TryFrom<Vec<u8>> for B3Digest { impl TryFrom<&[u8]> for B3Digest {
type Error = Error; type Error = Error;
// constructs a [B3Digest] from a [Vec<u8>]. // constructs a [B3Digest] from a &[u8].
// Returns an error if the digest has the wrong length. // Returns an error if the digest has the wrong length.
fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> { fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
if value.len() != B3_LEN { Ok(Self(
Err(Error::InvalidDigestLen(value.len())) value
} else { .try_into()
Ok(Self(value.into())) .map_err(|_e| Error::InvalidDigestLen(value.len()))?,
} ))
} }
} }
impl TryFrom<bytes::Bytes> for B3Digest { impl TryFrom<bytes::Bytes> for B3Digest {
type Error = Error; type Error = Error;
// constructs a [B3Digest] from a [bytes::Bytes].
// Returns an error if the digest has the wrong length.
fn try_from(value: bytes::Bytes) -> Result<Self, Self::Error> { fn try_from(value: bytes::Bytes) -> Result<Self, Self::Error> {
if value.len() != B3_LEN { value[..].try_into()
Err(Error::InvalidDigestLen(value.len()))
} else {
Ok(Self(value))
} }
} }
impl TryFrom<Vec<u8>> for B3Digest {
type Error = Error;
fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
value[..].try_into()
}
} }
impl From<&[u8; B3_LEN]> for B3Digest { impl From<&[u8; B3_LEN]> for B3Digest {
fn from(value: &[u8; B3_LEN]) -> Self { fn from(value: &[u8; B3_LEN]) -> Self {
Self(value.to_vec().into()) Self(*value)
} }
} }
impl From<B3Digest> for [u8; B3_LEN] { impl From<B3Digest> for [u8; B3_LEN] {
fn from(value: B3Digest) -> Self { fn from(value: B3Digest) -> Self {
value.0.to_vec().try_into().unwrap() value.0
} }
} }