diff options
Diffstat (limited to 'tvix/store/src/nar/mod.rs')
| -rw-r--r-- | tvix/store/src/nar/mod.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tvix/store/src/nar/mod.rs b/tvix/store/src/nar/mod.rs index d6a2f0889a5f..2bfb541733be 100644 --- a/tvix/store/src/nar/mod.rs +++ b/tvix/store/src/nar/mod.rs @@ -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>; } |