From 05b4e805eeda9dc827e1464d5fd5f672b8daf26e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jul 2024 22:49:05 +0200 Subject: refactor(tvix/nix-compat): rename PubKey to VerifyingKey Align these with the way it's called in the ed25519 crates. Change-Id: Ia52d3bb9bf831dc6b5f7d5356f5ac62135672883 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12013 Tested-by: BuildkiteCI Reviewed-by: raitobezarius Autosubmit: flokli --- tvix/store/src/pathinfoservice/nix_http.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tvix/store/src/pathinfoservice') diff --git a/tvix/store/src/pathinfoservice/nix_http.rs b/tvix/store/src/pathinfoservice/nix_http.rs index af9234bc0337..b74385c637ac 100644 --- a/tvix/store/src/pathinfoservice/nix_http.rs +++ b/tvix/store/src/pathinfoservice/nix_http.rs @@ -41,7 +41,7 @@ pub struct NixHTTPPathInfoService { /// An optional list of [narinfo::PubKey]. /// If set, the .narinfo files received need to have correct signature by at least one of these. - public_keys: Option>, + public_keys: Option>, } impl NixHTTPPathInfoService { @@ -59,7 +59,7 @@ impl NixHTTPPathInfoService { } /// Configures [Self] to validate NARInfo fingerprints with the public keys passed. - pub fn set_public_keys(&mut self, public_keys: Vec) { + pub fn set_public_keys(&mut self, public_keys: Vec) { self.public_keys = Some(public_keys); } } @@ -311,7 +311,7 @@ impl ServiceBuilder for NixHTTPPathInfoServiceConfig { public_keys .iter() .map(|pubkey_str| { - narinfo::PubKey::parse(pubkey_str) + narinfo::VerifyingKey::parse(pubkey_str) .map_err(|e| Error::StorageError(format!("invalid public key: {e}"))) }) .collect::, Error>>()?, -- cgit 1.4.1