about summary refs log tree commit diff
path: root/tvix/store/src/pathinfoservice/nix_http.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-07-21T20·49+0200
committerclbot <clbot@tvl.fyi>2024-07-21T21·41+0000
commit05b4e805eeda9dc827e1464d5fd5f672b8daf26e (patch)
treefe5d04f594085532790bd680c572b7be4338099f /tvix/store/src/pathinfoservice/nix_http.rs
parent62184ee35acac69666ba26c7db852a4059fa5723 (diff)
refactor(tvix/nix-compat): rename PubKey to VerifyingKey r/8394
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 <tvl@lahfa.xyz>
Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/store/src/pathinfoservice/nix_http.rs')
-rw-r--r--tvix/store/src/pathinfoservice/nix_http.rs6
1 files changed, 3 insertions, 3 deletions
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<BS, DS> {
 
     /// 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<Vec<narinfo::PubKey>>,
+    public_keys: Option<Vec<narinfo::VerifyingKey>>,
 }
 
 impl<BS, DS> NixHTTPPathInfoService<BS, DS> {
@@ -59,7 +59,7 @@ impl<BS, DS> NixHTTPPathInfoService<BS, DS> {
     }
 
     /// Configures [Self] to validate NARInfo fingerprints with the public keys passed.
-    pub fn set_public_keys(&mut self, public_keys: Vec<narinfo::PubKey>) {
+    pub fn set_public_keys(&mut self, public_keys: Vec<narinfo::VerifyingKey>) {
         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::<Result<Vec<_>, Error>>()?,