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
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
use ruma_events_macros::EventContent;
use ruma_identifiers::DeviceIdBox;
use serde::{Deserialize, Serialize};
use super::{Relation, VerificationMethod};
use crate::MessageEvent;
pub type ReadyEvent = MessageEvent<ReadyEventContent>;
#[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 ReadyToDeviceEventContent {
pub from_device: DeviceIdBox,
pub methods: Vec<VerificationMethod>,
pub transaction_id: String,
}
impl ReadyToDeviceEventContent {
pub fn new(
from_device: DeviceIdBox,
methods: Vec<VerificationMethod>,
transaction_id: String,
) -> 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 = Message)]
pub struct ReadyEventContent {
pub from_device: DeviceIdBox,
pub methods: Vec<VerificationMethod>,
#[serde(rename = "m.relates_to")]
pub relates_to: Relation,
}
impl ReadyEventContent {
pub fn new(
from_device: DeviceIdBox,
methods: Vec<VerificationMethod>,
relates_to: Relation,
) -> Self {
Self { from_device, methods, relates_to }
}
}
#[cfg(test)]
mod tests {
use matches::assert_matches;
use ruma_identifiers::{event_id, DeviceIdBox};
use ruma_serde::Raw;
use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
use super::{ReadyEventContent, ReadyToDeviceEventContent};
use crate::key::verification::{Relation, VerificationMethod};
#[test]
fn serialization() {
let event_id = event_id!("$1598361704261elfgc:localhost");
let device: DeviceIdBox = "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 = ReadyEventContent {
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 = ReadyToDeviceEventContent {
from_device: device,
transaction_id: "456".to_owned(),
methods: vec![VerificationMethod::SasV1],
};
assert_eq!(to_json_value(&content).unwrap(), json_data);
}
#[test]
fn deserialization() {
let id = event_id!("$1598361704261elfgc:localhost");
let device: DeviceIdBox = "123".into();
let json_data = json!({
"from_device": device,
"methods": ["m.sas.v1"],
"m.relates_to": {
"rel_type": "m.reference",
"event_id": id,
}
});
assert_matches!(
from_json_value::<Raw<ReadyEventContent>>(json_data)
.unwrap()
.deserialize()
.unwrap(),
ReadyEventContent {
from_device,
relates_to: Relation {
event_id
},
methods,
} if from_device == device
&& methods == vec![VerificationMethod::SasV1]
&& event_id == id
);
let json_data = json!({
"from_device": device,
"methods": ["m.sas.v1"],
"transaction_id": "456",
});
assert_matches!(
from_json_value::<Raw<ReadyToDeviceEventContent>>(json_data)
.unwrap()
.deserialize()
.unwrap(),
ReadyToDeviceEventContent {
from_device,
transaction_id,
methods,
} if from_device == device
&& methods == vec![VerificationMethod::SasV1]
&& transaction_id == "456"
);
}
}