From 971080c9120725c0bec21ea2e5e14847b0e996e6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Mar 2023 13:27:23 +0200 Subject: refactor(tvix/nix-compat): add text_hash_string function Use it to calculate the text_hash_string, which is then used in the calculate_derivation_path and path_with_references functions. Relates to b/263. Change-Id: I7478825e2a23a11224212fea5e3fd06daa97d5e5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8364 Autosubmit: flokli Reviewed-by: tazjin Tested-by: BuildkiteCI --- tvix/nix-compat/src/derivation/utils.rs | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'tvix/nix-compat/src/derivation/utils.rs') diff --git a/tvix/nix-compat/src/derivation/utils.rs b/tvix/nix-compat/src/derivation/utils.rs index cbb5d02a2180..68ab3e23c94b 100644 --- a/tvix/nix-compat/src/derivation/utils.rs +++ b/tvix/nix-compat/src/derivation/utils.rs @@ -1,7 +1,7 @@ use crate::derivation::DerivationError; use crate::nixbase32; -use crate::nixhash::NixHash; -use crate::store_path::{self, StorePath}; +use crate::store_path::StorePath; +use crate::texthash::text_hash_string; use sha2::{Digest, Sha256}; /// compress_hash takes an arbitrarily long sequence of bytes (usually @@ -55,27 +55,6 @@ pub fn path_with_references, I: IntoIterator, C: AsRef<[ content: C, references: I, ) -> Result { - let mut s = String::from("text"); - - for reference in references { - s.push(':'); - s.push_str(reference.as_ref()); - } - - let content_digest = { - let mut hasher = Sha256::new(); - hasher.update(content); - hasher.finalize() - }; - - let h = NixHash::new(crate::nixhash::HashAlgo::Sha256, content_digest.to_vec()); - - s.push_str(&format!( - ":{}:{}:{}", - h.to_nix_hash_string(), - store_path::STORE_DIR, - name - )); - - build_store_path(false, &s, name) + let text_hash_str = text_hash_string(name, content, references); + build_store_path(false, &text_hash_str, name) } -- cgit 1.4.1