chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ruma-events: Implement TryFrom to for MSasV1Content.

Browse Source
This commit is contained in:
Damir Jelić 2020-07-30 10:56:14 +02:00 committed by Jonas Platte
parent afeb328705
commit 21837d6b8d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruma-events/src/key/verification/start.rs
View File

@ -1,6 +1,6 @@
//! Types for the *m.key.verification.start* event. //! Types for the *m.key.verification.start* event.
use std::collections::BTreeMap; use std::{collections::BTreeMap, convert::TryFrom};
use ruma_events_macros::BasicEventContent; use ruma_events_macros::BasicEventContent;
use ruma_identifiers::DeviceId; use ruma_identifiers::DeviceId;
@ -123,6 +123,15 @@ impl MSasV1Content {
/// `MessageAuthenticationCode::HkdfHmacSha256`. /// `MessageAuthenticationCode::HkdfHmacSha256`.
/// * `short_authentication_string` does not include `ShortAuthenticationString::Decimal`. /// * `short_authentication_string` does not include `ShortAuthenticationString::Decimal`.
pub fn new(options: MSasV1ContentOptions) -> Result<Self, InvalidInput> { pub fn new(options: MSasV1ContentOptions) -> Result<Self, InvalidInput> {
MSasV1Content::try_from(options)
}
}
impl TryFrom<MSasV1ContentOptions> for MSasV1Content {
type Error = InvalidInput;
/// Creates a new `MSasV1Content` from the given init struct.
fn try_from(options: MSasV1ContentOptions) -> Result<Self, Self::Error> {
if !options.key_agreement_protocols.contains(&KeyAgreementProtocol::Curve25519) if !options.key_agreement_protocols.contains(&KeyAgreementProtocol::Curve25519)
&& !options && !options
.key_agreement_protocols .key_agreement_protocols