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
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
use std::collections::HashSet;
use serde::de::Visitor;
use tor_llcrypto::pk::{ed25519::Ed25519Identity, rsa::RsaIdentity};
use crate::{RelayId, RelayIdRef};
#[derive(Clone, Debug, Default, Eq, PartialEq)]
pub struct RelayIdSet {
ed25519: HashSet<Ed25519Identity>,
rsa: HashSet<RsaIdentity>,
}
impl RelayIdSet {
pub fn new() -> Self {
Self::default()
}
pub fn insert<T: Into<RelayId>>(&mut self, key: T) -> bool {
let key: RelayId = key.into();
match key {
RelayId::Ed25519(key) => self.ed25519.insert(key),
RelayId::Rsa(key) => self.rsa.insert(key),
}
}
pub fn remove<'a, T: Into<RelayIdRef<'a>>>(&mut self, key: T) -> bool {
let key: RelayIdRef<'a> = key.into();
match key {
RelayIdRef::Ed25519(key) => self.ed25519.remove(key),
RelayIdRef::Rsa(key) => self.rsa.remove(key),
}
}
pub fn contains<'a, T: Into<RelayIdRef<'a>>>(&self, key: T) -> bool {
let key: RelayIdRef<'a> = key.into();
match key {
RelayIdRef::Ed25519(key) => self.ed25519.contains(key),
RelayIdRef::Rsa(key) => self.rsa.contains(key),
}
}
pub fn iter(&self) -> impl Iterator<Item = RelayIdRef<'_>> {
self.ed25519
.iter()
.map(|id| id.into())
.chain(self.rsa.iter().map(|id| id.into()))
}
pub fn len(&self) -> usize {
self.ed25519.len() + self.rsa.len()
}
pub fn is_empty(&self) -> bool {
self.ed25519.is_empty() && self.rsa.is_empty()
}
}
impl<ID: Into<RelayId>> Extend<ID> for RelayIdSet {
fn extend<T: IntoIterator<Item = ID>>(&mut self, iter: T) {
for item in iter {
self.insert(item);
}
}
}
impl FromIterator<RelayId> for RelayIdSet {
fn from_iter<T: IntoIterator<Item = RelayId>>(iter: T) -> Self {
let mut set = RelayIdSet::new();
set.extend(iter);
set
}
}
impl serde::Serialize for RelayIdSet {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
serializer.collect_seq(self.iter())
}
}
impl<'de> serde::Deserialize<'de> for RelayIdSet {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
struct IdSetVisitor;
impl<'de> Visitor<'de> for IdSetVisitor {
type Value = RelayIdSet;
fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "a list of relay identities")
}
fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
where
A: serde::de::SeqAccess<'de>,
{
let mut set = RelayIdSet::new();
while let Some(key) = seq.next_element::<RelayId>()? {
set.insert(key);
}
Ok(set)
}
}
deserializer.deserialize_seq(IdSetVisitor)
}
}
#[cfg(test)]
mod test {
#![allow(clippy::bool_assert_comparison)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::dbg_macro)]
#![allow(clippy::print_stderr)]
#![allow(clippy::print_stdout)]
#![allow(clippy::single_char_pattern)]
#![allow(clippy::unwrap_used)]
use super::*;
use hex_literal::hex;
use serde_test::{assert_tokens, Token};
#[test]
fn basic_usage() {
#![allow(clippy::cognitive_complexity)]
let rsa1 = RsaIdentity::from(hex!("42656c6f7665642c207768617420617265206e61"));
let rsa2 = RsaIdentity::from(hex!("6d657320627574206169723f43686f6f73652074"));
let rsa3 = RsaIdentity::from(hex!("686f752077686174657665722073756974732074"));
let ed1 = Ed25519Identity::from(hex!(
"6865206c696e653a43616c6c206d652053617070686f2c2063616c6c206d6520"
));
let ed2 = Ed25519Identity::from(hex!(
"43686c6f7269732c2043616c6c206d65204c616c6167652c206f7220446f7269"
));
let ed3 = Ed25519Identity::from(hex!(
"732c204f6e6c792c206f6e6c792c2063616c6c206d65207468696e652e000000"
));
let mut set = RelayIdSet::new();
assert_eq!(set.is_empty(), true);
assert_eq!(set.len(), 0);
set.insert(rsa1);
set.insert(rsa2);
set.insert(ed1);
assert_eq!(set.is_empty(), false);
assert_eq!(set.len(), 3);
assert_eq!(set.contains(&rsa1), true);
assert_eq!(set.contains(&rsa2), true);
assert_eq!(set.contains(&rsa3), false);
assert_eq!(set.contains(&ed1), true);
assert_eq!(set.contains(&ed2), false);
assert_eq!(set.contains(&ed3), false);
let contents: HashSet<_> = set.iter().collect();
assert_eq!(contents.len(), set.len());
assert!(contents.contains(&RelayIdRef::from(&rsa1)));
assert!(contents.contains(&RelayIdRef::from(&rsa2)));
assert!(contents.contains(&RelayIdRef::from(&ed1)));
assert_eq!(set.remove(&ed2), false);
assert_eq!(set.remove(&ed1), true);
assert_eq!(set.remove(&rsa3), false);
assert_eq!(set.remove(&rsa1), true);
assert_eq!(set.is_empty(), false);
assert_eq!(set.len(), 1);
assert_eq!(set.contains(&ed1), false);
assert_eq!(set.contains(&rsa1), false);
assert_eq!(set.contains(&rsa2), true);
let contents2: Vec<_> = set.iter().collect();
assert_eq!(contents2, vec![RelayIdRef::from(&rsa2)]);
let set2: RelayIdSet = set.iter().map(|id| id.to_owned()).collect();
assert_eq!(set, set2);
let mut set3 = RelayIdSet::new();
set3.extend(set.iter().map(|id| id.to_owned()));
assert_eq!(set2, set3);
}
#[test]
fn serde_empty() {
let set = RelayIdSet::new();
assert_tokens(&set, &[Token::Seq { len: Some(0) }, Token::SeqEnd]);
}
#[test]
fn serde_singleton_rsa() {
let mut set = RelayIdSet::new();
set.insert(RsaIdentity::from(hex!(
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
)));
assert_tokens(
&set,
&[
Token::Seq { len: Some(1) },
Token::Str("$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
Token::SeqEnd,
],
);
}
#[test]
fn serde_singleton_ed25519() {
let mut set = RelayIdSet::new();
set.insert(Ed25519Identity::from(hex!(
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
)));
assert_tokens(
&set,
&[
Token::Seq { len: Some(1) },
Token::String("ed25519:u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7s"),
Token::SeqEnd,
],
);
}
}