From 4458efa2b2fdb850f68e9afa3ffd72d21155bed7 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 17 Jun 2024 07:21:51 +0000 Subject: [PATCH] rename signing_keys_for to verify_keys_for Signed-off-by: Jason Volk --- src/admin/query/globals.rs | 2 +- src/service/globals/data.rs | 2 +- src/service/globals/mod.rs | 4 ++-- src/service/rooms/event_handler/signing_keys.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/admin/query/globals.rs b/src/admin/query/globals.rs index 9bdd38fc..38986071 100644 --- a/src/admin/query/globals.rs +++ b/src/admin/query/globals.rs @@ -46,7 +46,7 @@ pub(super) async fn globals(subcommand: Globals) -> Result { let timer = tokio::time::Instant::now(); - let results = services().globals.db.signing_keys_for(&origin); + let results = services().globals.db.verify_keys_for(&origin); let query_time = timer.elapsed(); Ok(RoomMessageEventContent::notice_markdown(format!( diff --git a/src/service/globals/data.rs b/src/service/globals/data.rs index 5d6240cd..d73ddec6 100644 --- a/src/service/globals/data.rs +++ b/src/service/globals/data.rs @@ -289,7 +289,7 @@ impl Data { /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found /// for the server. - pub fn signing_keys_for(&self, origin: &ServerName) -> Result> { + pub fn verify_keys_for(&self, origin: &ServerName) -> Result> { let signingkeys = self .server_signingkeys .get(origin.as_bytes())? diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs index c2c7d969..d46eb79e 100644 --- a/src/service/globals/mod.rs +++ b/src/service/globals/mod.rs @@ -272,8 +272,8 @@ impl Service { /// This returns an empty `Ok(BTreeMap<..>)` when there are no keys found /// for the server. - pub fn signing_keys_for(&self, origin: &ServerName) -> Result> { - let mut keys = self.db.signing_keys_for(origin)?; + pub fn verify_keys_for(&self, origin: &ServerName) -> Result> { + let mut keys = self.db.verify_keys_for(origin)?; if origin == self.server_name() { keys.insert( format!("ed25519:{}", self.keypair().version()) diff --git a/src/service/rooms/event_handler/signing_keys.rs b/src/service/rooms/event_handler/signing_keys.rs index 1ebcbefb..d7cb3a9d 100644 --- a/src/service/rooms/event_handler/signing_keys.rs +++ b/src/service/rooms/event_handler/signing_keys.rs @@ -148,7 +148,7 @@ impl super::Service { let result: BTreeMap<_, _> = self .services .globals - .signing_keys_for(origin)? + .verify_keys_for(origin)? .into_iter() .map(|(k, v)| (k.to_string(), v.key)) .collect(); @@ -354,7 +354,7 @@ impl super::Service { let mut result: BTreeMap<_, _> = self .services .globals - .signing_keys_for(origin)? + .verify_keys_for(origin)? .into_iter() .map(|(k, v)| (k.to_string(), v.key)) .collect();