From f8bf8b3fb83e440a057064ad11a80faec08f092f Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sat, 28 Nov 2020 00:19:25 +0100
Subject: [PATCH] federation-api: Rename SigningKey => ServerSigningKeys

---
 ruma-federation-api/src/discovery.rs                  |  6 +++---
 .../src/discovery/get_remote_server_keys/v2.rs        |  7 ++++---
 .../src/discovery/get_remote_server_keys_batch/v2.rs  |  6 +++---
 .../src/discovery/get_server_keys/v2.rs               | 11 ++++++-----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ruma-federation-api/src/discovery.rs b/ruma-federation-api/src/discovery.rs
index 65a91692..40b36f42 100644
--- a/ruma-federation-api/src/discovery.rs
+++ b/ruma-federation-api/src/discovery.rs
@@ -49,7 +49,7 @@ impl OldVerifyKey {
 /// Queried server key, signed by the notary server.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
-pub struct SigningKey {
+pub struct ServerSigningKeys {
     /// DNS name of the homeserver.
     pub server_name: ServerNameBox,
 
@@ -69,8 +69,8 @@ pub struct SigningKey {
     pub valid_until_ts: SystemTime,
 }
 
-impl SigningKey {
-    /// Creates a new `SigningKey` with the given server name and validity timestamp.
+impl ServerSigningKeys {
+    /// Creates a new `ServerSigningKeys` with the given server name and validity timestamp.
     ///
     /// All other fields will be empty.
     pub fn new(server_name: ServerNameBox, valid_until_ts: SystemTime) -> Self {
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs b/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
index 76c991e7..13e3188a 100644
--- a/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
+++ b/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
@@ -2,10 +2,11 @@
 
 use std::time::SystemTime;
 
-use crate::discovery::SigningKey;
 use ruma_api::ruma_api;
 use ruma_identifiers::ServerName;
 
+use crate::discovery::ServerSigningKeys;
+
 ruma_api! {
     metadata: {
         description: "Query for another server's keys.",
@@ -34,7 +35,7 @@ ruma_api! {
 
     response: {
         /// The queried server's keys, signed by the notary server.
-        pub server_keys: Vec<SigningKey>,
+        pub server_keys: Vec<ServerSigningKeys>,
     }
 }
 
@@ -47,7 +48,7 @@ impl<'a> Request<'a> {
 
 impl Response {
     /// Creates a new `Response` with the given keys.
-    pub fn new(server_keys: Vec<SigningKey>) -> Self {
+    pub fn new(server_keys: Vec<ServerSigningKeys>) -> Self {
         Self { server_keys }
     }
 }
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs b/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
index d39da56a..8d9e797e 100644
--- a/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
+++ b/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
@@ -2,7 +2,7 @@
 
 use std::{collections::BTreeMap, time::SystemTime};
 
-use crate::discovery::SigningKey;
+use crate::discovery::ServerSigningKeys;
 use ruma_api::ruma_api;
 use ruma_identifiers::{ServerNameBox, ServerSigningKeyId};
 use serde::{Deserialize, Serialize};
@@ -43,7 +43,7 @@ ruma_api! {
 
     response: {
         /// The queried server's keys, signed by the notary server.
-        pub server_keys: Vec<SigningKey>,
+        pub server_keys: Vec<ServerSigningKeys>,
     }
 }
 
@@ -59,7 +59,7 @@ impl Request {
 
 impl Response {
     /// Creates a new `Response` with the given keys.
-    pub fn new(server_keys: Vec<SigningKey>) -> Self {
+    pub fn new(server_keys: Vec<ServerSigningKeys>) -> Self {
         Self { server_keys }
     }
 }
diff --git a/ruma-federation-api/src/discovery/get_server_keys/v2.rs b/ruma-federation-api/src/discovery/get_server_keys/v2.rs
index de5944f7..a87160c1 100644
--- a/ruma-federation-api/src/discovery/get_server_keys/v2.rs
+++ b/ruma-federation-api/src/discovery/get_server_keys/v2.rs
@@ -1,8 +1,9 @@
 //! [GET /_matrix/key/v2/server](https://matrix.org/docs/spec/server_server/r0.1.4#get-matrix-key-v2-server-keyid)
 
-use crate::discovery::SigningKey;
 use ruma_api::ruma_api;
 
+use crate::discovery::ServerSigningKeys;
+
 ruma_api! {
     metadata: {
         description: "Gets the homeserver's published signing keys.",
@@ -19,7 +20,7 @@ ruma_api! {
     response: {
         /// Queried server key, signed by the notary server.
         #[ruma_api(body)]
-        pub server_key: SigningKey,
+        pub server_key: ServerSigningKeys,
     }
 }
 
@@ -32,13 +33,13 @@ impl Request {
 
 impl Response {
     /// Creates a new `Response` with the given server key.
-    pub fn new(server_key: SigningKey) -> Self {
+    pub fn new(server_key: ServerSigningKeys) -> Self {
         Self { server_key }
     }
 }
 
-impl From<SigningKey> for Response {
-    fn from(server_key: SigningKey) -> Self {
+impl From<ServerSigningKeys> for Response {
+    fn from(server_key: ServerSigningKeys) -> Self {
         Self::new(server_key)
     }
 }