maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/store/directorysvc): move from Vec<u8> to B3Digest

Browse source 
This introduces a new struct, B3Digest, which internally holds a
Vec<u8>, but only allows construction with 32 bytes.

It also implements display, which will print the base64 representation.
This should reduce some boilerplate when parsing Vec<u8>.

Change-Id: Ia91aa40cb691916773abc8f93e6ed79a5fd34863
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8592
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-05-18 21:43:33 +03:00 • committed by clbot
parent e779b866cc
commit b8ff08b1b0
17 changed files with 199 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tvix/store/src/nar/mod.rs
View file

@ -1,4 +1,4 @@
use crate::proto;
use crate::{proto, B3Digest};
use data_encoding::BASE64;
use thiserror::Error;
@ -14,14 +14,14 @@ pub enum RenderError {
#[error("failure talking to a backing store client: {0}")]
StoreError(crate::Error),
#[error("unable to find directory {}, referred from {}", BASE64.encode(.0), .1)]
DirectoryNotFound(Vec<u8>, String),
#[error("unable to find directory {}, referred from {}", .0, .1)]
DirectoryNotFound(B3Digest, String),
#[error("unable to find blob {}, referred from {}", BASE64.encode(.0), .1)]
BlobNotFound(Vec<u8>, String),
BlobNotFound([u8; 32], String),
#[error("unexpected size in metadata for blob {}, referred from {} returned, expected {}, got {}", BASE64.encode(.0), .1, .2, .3)]
UnexpectedBlobMeta(Vec<u8>, String, u32, u32),
UnexpectedBlobMeta([u8; 32], String, u32, u32),
#[error("failure using the NAR writer: {0}")]
NARWriterError(std::io::Error),
@ -29,8 +29,5 @@ pub enum RenderError {
/// The base trait for something calculating NARs, and returning their size and sha256.
pub trait NARCalculationService {
fn calculate_nar(
&self,
root_node: &proto::node::Node,
) -> Result<proto::CalculateNarResponse, RenderError>;
fn calculate_nar(&self, root_node: &proto::node::Node) -> Result<(u64, [u8; 32]), RenderError>;
}