diff --git a/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs index 22fdb4e8..96746990 100644 --- a/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs +++ b/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs @@ -11,6 +11,7 @@ pub mod v2 { use ruma_api::ruma_api; use ruma_common::MilliSecondsSinceUnixEpoch; use ruma_identifiers::ServerName; + use ruma_serde::Raw; use crate::discovery::ServerSigningKeys; @@ -43,7 +44,7 @@ pub mod v2 { response: { /// The queried server's keys, signed by the notary server. - pub server_keys: Vec, + pub server_keys: Vec>, } } @@ -59,7 +60,7 @@ pub mod v2 { impl Response { /// Creates a new `Response` with the given keys. - pub fn new(server_keys: Vec) -> Self { + pub fn new(server_keys: Vec>) -> Self { Self { server_keys } } } diff --git a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs index c76ee008..35ce262d 100644 --- a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs +++ b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs @@ -13,6 +13,7 @@ pub mod v2 { use ruma_api::ruma_api; use ruma_common::MilliSecondsSinceUnixEpoch; use ruma_identifiers::{ServerName, ServerSigningKeyId}; + use ruma_serde::Raw; use serde::{Deserialize, Serialize}; use crate::discovery::ServerSigningKeys; @@ -43,7 +44,7 @@ pub mod v2 { response: { /// The queried server's keys, signed by the notary server. - pub server_keys: Vec, + pub server_keys: Vec>, } } @@ -61,7 +62,7 @@ pub mod v2 { impl Response { /// Creates a new `Response` with the given keys. - pub fn new(server_keys: Vec) -> Self { + pub fn new(server_keys: Vec>) -> Self { Self { server_keys } } } diff --git a/crates/ruma-federation-api/src/discovery/get_server_keys.rs b/crates/ruma-federation-api/src/discovery/get_server_keys.rs index a87b8592..894f41b0 100644 --- a/crates/ruma-federation-api/src/discovery/get_server_keys.rs +++ b/crates/ruma-federation-api/src/discovery/get_server_keys.rs @@ -11,6 +11,7 @@ pub mod v2 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixkeyv2serverkeyid use ruma_api::ruma_api; + use ruma_serde::Raw; use crate::discovery::ServerSigningKeys; @@ -31,7 +32,7 @@ pub mod v2 { response: { /// Queried server key, signed by the notary server. #[ruma_api(body)] - pub server_key: ServerSigningKeys, + pub server_key: Raw, } } @@ -44,13 +45,13 @@ pub mod v2 { impl Response { /// Creates a new `Response` with the given server key. - pub fn new(server_key: ServerSigningKeys) -> Self { + pub fn new(server_key: Raw) -> Self { Self { server_key } } } - impl From for Response { - fn from(server_key: ServerSigningKeys) -> Self { + impl From> for Response { + fn from(server_key: Raw) -> Self { Self::new(server_key) } }