1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
use ruma_macros::EventContent;
use serde::{Deserialize, Serialize};
use super::{Relation, VerificationMethod};
use crate::{OwnedDeviceId, OwnedTransactionId};
#[derive(Clone, Debug, Deserialize, Serialize, EventContent)]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[ruma_event(type = "m.key.verification.ready", kind = ToDevice)]
pub struct ToDeviceKeyVerificationReadyEventContent {
pub from_device: OwnedDeviceId,
pub methods: Vec<VerificationMethod>,
pub transaction_id: OwnedTransactionId,
}
impl ToDeviceKeyVerificationReadyEventContent {
pub fn new(
from_device: OwnedDeviceId,
methods: Vec<VerificationMethod>,
transaction_id: OwnedTransactionId,
) -> Self {
Self { from_device, methods, transaction_id }
}
}
#[derive(Clone, Debug, Deserialize, Serialize, EventContent)]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[ruma_event(type = "m.key.verification.ready", kind = MessageLike)]
pub struct KeyVerificationReadyEventContent {
pub from_device: OwnedDeviceId,
pub methods: Vec<VerificationMethod>,
#[serde(rename = "m.relates_to")]
pub relates_to: Relation,
}
impl KeyVerificationReadyEventContent {
pub fn new(
from_device: OwnedDeviceId,
methods: Vec<VerificationMethod>,
relates_to: Relation,
) -> Self {
Self { from_device, methods, relates_to }
}
}
#[cfg(test)]
mod tests {
use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
use super::{KeyVerificationReadyEventContent, ToDeviceKeyVerificationReadyEventContent};
use crate::{
event_id,
events::key::verification::{Relation, VerificationMethod},
OwnedDeviceId,
};
#[test]
fn serialization() {
let event_id = event_id!("$1598361704261elfgc:localhost").to_owned();
let device: OwnedDeviceId = "123".into();
let json_data = json!({
"from_device": device,
"methods": ["m.sas.v1"],
"m.relates_to": {
"rel_type": "m.reference",
"event_id": event_id,
}
});
let content = KeyVerificationReadyEventContent {
from_device: device.clone(),
relates_to: Relation { event_id },
methods: vec![VerificationMethod::SasV1],
};
assert_eq!(to_json_value(&content).unwrap(), json_data);
let json_data = json!({
"from_device": device,
"methods": ["m.sas.v1"],
"transaction_id": "456",
});
let content = ToDeviceKeyVerificationReadyEventContent {
from_device: device,
transaction_id: "456".into(),
methods: vec![VerificationMethod::SasV1],
};
assert_eq!(to_json_value(&content).unwrap(), json_data);
}
#[test]
fn deserialization() {
let json_data = json!({
"from_device": "123",
"methods": ["m.sas.v1"],
"m.relates_to": {
"rel_type": "m.reference",
"event_id": "$1598361704261elfgc:localhost",
}
});
let content = from_json_value::<KeyVerificationReadyEventContent>(json_data).unwrap();
assert_eq!(content.from_device, "123");
assert_eq!(content.methods, vec![VerificationMethod::SasV1]);
assert_eq!(content.relates_to.event_id, "$1598361704261elfgc:localhost");
let json_data = json!({
"from_device": "123",
"methods": ["m.sas.v1"],
"transaction_id": "456",
});
let content =
from_json_value::<ToDeviceKeyVerificationReadyEventContent>(json_data).unwrap();
assert_eq!(content.from_device, "123");
assert_eq!(content.methods, vec![VerificationMethod::SasV1]);
assert_eq!(content.transaction_id, "456");
}
}