From 499bc2f7ee263e468e444784daddc4ba66349d2c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 18 Mar 2024 15:17:57 +0200 Subject: refactor(tvix/castore/blobsvc): use B3Digest Display impl We don't need to use BASE64 here on our own, B3Digest has a Display impl. This will also make sure the `b3:` digest is present in field values. Change-Id: I0ce6ee0f7e7e99fb9b16872953a1b742e99be291 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11192 Reviewed-by: Connor Brewster Tested-by: BuildkiteCI Autosubmit: flokli --- tvix/castore/src/blobservice/chunked_reader.rs | 6 +----- tvix/castore/src/blobservice/combinator.rs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'tvix') diff --git a/tvix/castore/src/blobservice/chunked_reader.rs b/tvix/castore/src/blobservice/chunked_reader.rs index 6ca0d20032..e2a9f614c4 100644 --- a/tvix/castore/src/blobservice/chunked_reader.rs +++ b/tvix/castore/src/blobservice/chunked_reader.rs @@ -1,4 +1,3 @@ -use data_encoding::BASE64; use futures::TryStreamExt; use pin_project_lite::pin_project; use tokio::io::{AsyncRead, AsyncSeekExt}; @@ -222,10 +221,7 @@ where .open_read(&chunk_digest.to_owned()) .await? .ok_or_else(|| { - warn!( - chunk.digest = BASE64.encode(chunk_digest.as_slice()), - "chunk not found" - ); + warn!(chunk.digest = %chunk_digest, "chunk not found"); std::io::Error::new(std::io::ErrorKind::NotFound, "chunk not found") })?; diff --git a/tvix/castore/src/blobservice/combinator.rs b/tvix/castore/src/blobservice/combinator.rs index d75cad62a6..067eff96f4 100644 --- a/tvix/castore/src/blobservice/combinator.rs +++ b/tvix/castore/src/blobservice/combinator.rs @@ -1,4 +1,3 @@ -use data_encoding::BASE64; use futures::{StreamExt, TryStreamExt}; use tokio_util::io::{ReaderStream, StreamReader}; use tonic::async_trait; @@ -114,10 +113,7 @@ where let blob_service = blob_service.clone(); async move { blob_service.open_read(&d.to_owned()).await?.ok_or_else(|| { - warn!( - chunk.digest = BASE64.encode(digest.as_slice()), - "chunk not found" - ); + warn!(chunk.digest = %digest, "chunk not found"); std::io::Error::new(std::io::ErrorKind::NotFound, "chunk not found") }) } -- cgit 1.4.1