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

refactor(tvix/nix-compat): make NixHash an enum with fixed-len bytes

Browse source 
Less Vec<u8> passed around.

Change-Id: Ie153a6bfaa084d7490ffa38634efdf5f3c31a768
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9722
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-10-14 17:48:16 +01:00 • committed by clbot
parent 786b0324a9
commit 4ae0f428bd
8 changed files with 226 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tvix/nix-compat/src/derivation/mod.rs
View file

@ -168,7 +168,8 @@ impl Derivation {
// This is not the [NixHash::to_nix_hash_string], but without the sha256: prefix).
for (drv_path, output_names) in &self.input_derivations {
replaced_input_derivations.insert(
data_encoding::HEXLOWER.encode(&fn_get_derivation_or_fod_hash(drv_path).digest),
data_encoding::HEXLOWER
.encode(fn_get_derivation_or_fod_hash(drv_path).digest_as_bytes()),
output_names.clone(),
);
}
@ -186,12 +187,7 @@ impl Derivation {
hasher.finalize().to_vec()
});
// We populate the struct directly, as we know the sha256 digest has the
// right size.
NixHash {
algo: crate::nixhash::HashAlgo::Sha256,
digest: digest.to_vec(),
}
NixHash::Sha256(digest.try_into().unwrap())
}
/// This calculates all output paths of a Derivation and updates the struct.

4
tvix/nix-compat/src/derivation/output.rs
View file

@ -44,8 +44,8 @@ impl Output {
if let Some(hash) = &self.hash_with_mode {
match hash {
NixHashWithMode::Flat(h) | NixHashWithMode::Recursive(h) => {
if h.algo != HashAlgo::Sha1 || h.algo != HashAlgo::Sha256 {
return Err(OutputError::InvalidHashAlgo(h.algo.to_string()));
if h.algo() != HashAlgo::Sha1 || h.algo() != HashAlgo::Sha256 {
return Err(OutputError::InvalidHashAlgo(h.algo().to_string()));
}
}
}

7
tvix/nix-compat/src/derivation/tests/mod.rs
View file

@ -238,17 +238,16 @@ fn output_path_construction() {
Output {
path: "".to_string(), // will be calculated
hash_with_mode: Some(crate::nixhash::NixHashWithMode::Recursive(
(
crate::nixhash::from_algo_and_digest(
crate::nixhash::HashAlgo::Sha256,
data_encoding::HEXLOWER
&data_encoding::HEXLOWER
.decode(
"08813cbee9903c62be4c5027726a418a300da4500b2d369d3af9286f4815ceba"
.as_bytes(),
)
.unwrap(),
)
.try_into()
.unwrap(),
.unwrap(),
)),
},
);

24
tvix/nix-compat/src/derivation/write.rs
View file

@ -79,22 +79,20 @@ pub fn write_outputs(
let mut elements: Vec<&str> = vec![output_name, &output.path];
let (e2, e3) = match &output.hash_with_mode {
Some(hash) => match hash {
crate::nixhash::NixHashWithMode::Flat(h) => (
h.algo.to_string(),
data_encoding::HEXLOWER.encode(&h.digest),
),
crate::nixhash::NixHashWithMode::Recursive(h) => (
format!("r:{}", h.algo),
data_encoding::HEXLOWER.encode(&h.digest),
),
},
let (mode_and_algo, digest) = match &output.hash_with_mode {
Some(crate::nixhash::NixHashWithMode::Flat(h)) => (
h.algo().to_string(),
data_encoding::HEXLOWER.encode(h.digest_as_bytes()),
),
Some(crate::nixhash::NixHashWithMode::Recursive(h)) => (
format!("r:{}", h.algo()),
data_encoding::HEXLOWER.encode(h.digest_as_bytes()),
),
None => ("".to_string(), "".to_string()),
};
elements.push(&e2);
elements.push(&e3);
elements.push(&mode_and_algo);
elements.push(&digest);
write_array_elements(writer, &elements)?;