split signing_keys_for from verify_keys_for

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/globals/data.rs

@@ -291,9 +291,7 @@ impl Data {
 	/// for the server.
 	pub fn verify_keys_for(&self, origin: &ServerName) -> Result<BTreeMap<OwnedServerSigningKeyId, VerifyKey>> {
 		let signingkeys = self
-			.server_signingkeys
+			.signing_keys_for(origin)?
-			.get(origin.as_bytes())?
-			.and_then(|bytes| serde_json::from_slice(&bytes).ok())
 			.map_or_else(BTreeMap::new, |keys: ServerSigningKeys| {
 				let mut tree = keys.verify_keys;
 				tree.extend(
@@ -307,6 +305,15 @@ impl Data {
 		Ok(signingkeys)
 	}
 
+	pub fn signing_keys_for(&self, origin: &ServerName) -> Result<Option<ServerSigningKeys>> {
+		let signingkeys = self
+			.server_signingkeys
+			.get(origin.as_bytes())?
+			.and_then(|bytes| serde_json::from_slice(&bytes).ok());
+
+		Ok(signingkeys)
+	}
+
 	pub fn database_version(&self) -> Result<u64> {
 		self.global.get(b"version")?.map_or(Ok(0), |version| {
 			utils::u64_from_bytes(&version).map_err(|_| Error::bad_database("Database version id is invalid."))

src/service/globals/mod.rs

@@ -13,7 +13,10 @@ use data::Data;
 use ipaddress::IPAddress;
 use regex::RegexSet;
 use ruma::{
-	api::{client::discovery::discover_support::ContactRole, federation::discovery::VerifyKey},
+	api::{
+		client::discovery::discover_support::ContactRole,
+		federation::discovery::{ServerSigningKeys, VerifyKey},
+	},
 	serde::Base64,
 	DeviceId, OwnedEventId, OwnedRoomAliasId, OwnedServerName, OwnedServerSigningKeyId, OwnedUserId, RoomAliasId,
 	RoomVersionId, ServerName, UserId,
@@ -288,6 +291,10 @@ impl Service {
 		Ok(keys)
 	}
 
+	pub fn signing_keys_for(&self, origin: &ServerName) -> Result<Option<ServerSigningKeys>> {
+		self.db.signing_keys_for(origin)
+	}
+
 	pub fn well_known_client(&self) -> &Option<Url> { &self.config.well_known.client }
 
 	pub fn well_known_server(&self) -> &Option<OwnedServerName> { &self.config.well_known.server }