Skip to content

Commit 468b5f8

Browse files
committed
refactor(crypto): remove crypto_init
1 parent 6775a6d commit 468b5f8

File tree

101 files changed

+2
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2
-433
lines changed

examples/dht_server.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ fn as_packed_node(pk: &str, saddr: &str) -> PackedNode {
3333
async fn main() -> Result<(), Error> {
3434
env_logger::init();
3535

36-
if crypto_init().is_err() {
37-
panic!("Crypto initialization failed.");
38-
}
39-
4036
let (server_pk, server_sk) = gen_keypair();
4137

4238
// Create a channel for server to communicate with network

tox_binary_io/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,9 @@ equals original value. Type of this value should implement `ToBytes`,
108108
*/
109109
#[macro_export]
110110
macro_rules! encode_decode_test (
111-
($init:expr, $test:ident, $value:expr) => (
111+
($test:ident, $value:expr) => (
112112
#[test]
113113
fn $test() {
114-
$init;
115-
116114
let value = $value;
117115
let mut buf = [0; 1024 * 1024];
118116
let (_, size) = value.to_bytes((&mut buf, 0)).unwrap();

tox_core/src/dht/codec.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ mod tests {
171171

172172
#[test]
173173
fn encode_decode() {
174-
crypto_init().unwrap();
175174
let test_packets = vec![
176175
Packet::PingRequest(PingRequest {
177176
pk: gen_keypair().0,
@@ -315,7 +314,6 @@ mod tests {
315314

316315
#[test]
317316
fn decode_encrypted_packet_incomplete() {
318-
crypto_init().unwrap();
319317
let stats = Stats::new();
320318
let mut codec = DhtCodec::new(stats);
321319
let mut buf = BytesMut::new();
@@ -334,7 +332,6 @@ mod tests {
334332

335333
#[test]
336334
fn decode_encrypted_packet_error() {
337-
crypto_init().unwrap();
338335
let stats = Stats::new();
339336
let mut codec = DhtCodec::new(stats);
340337
let mut buf = BytesMut::new();
@@ -349,7 +346,6 @@ mod tests {
349346

350347
#[test]
351348
fn decode_encrypted_packet_zero_length() {
352-
crypto_init().unwrap();
353349
let stats = Stats::new();
354350
let mut codec = DhtCodec::new(stats);
355351
let mut buf = BytesMut::new();
@@ -360,7 +356,6 @@ mod tests {
360356

361357
#[test]
362358
fn encode_packet_too_big() {
363-
crypto_init().unwrap();
364359
let stats = Stats::new();
365360
let mut codec = DhtCodec::new(stats);
366361
let mut buf = BytesMut::new();

tox_core/src/dht/daemon_state.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ mod tests {
112112

113113
#[tokio::test]
114114
async fn daemon_state_serialize_deserialize() {
115-
crypto_init().unwrap();
116115
let (pk, sk) = gen_keypair();
117116
let (tx, rx) = mpsc::channel(1);
118117
let alice = Server::new(tx, pk, sk);

tox_core/src/dht/dht_friend.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ mod tests {
103103

104104
#[test]
105105
fn addr_is_unknown() {
106-
crypto_init().unwrap();
107106
let pk = gen_keypair().0;
108107
let mut friend = DhtFriend::new(&mut thread_rng(), pk);
109108

@@ -115,7 +114,6 @@ mod tests {
115114

116115
#[test]
117116
fn addr_is_known() {
118-
crypto_init().unwrap();
119117
let pk = gen_keypair().0;
120118
let mut friend = DhtFriend::new(&mut thread_rng(), pk);
121119

@@ -129,7 +127,6 @@ mod tests {
129127

130128
#[test]
131129
fn get_returned_addrs() {
132-
crypto_init().unwrap();
133130
let pk = gen_keypair().0;
134131
let mut friend = DhtFriend::new(&mut thread_rng(), pk);
135132

@@ -162,7 +159,6 @@ mod tests {
162159

163160
#[tokio::test]
164161
async fn get_returned_addrs_timed_out() {
165-
crypto_init().unwrap();
166162
let pk = gen_keypair().0;
167163
let mut friend = DhtFriend::new(&mut thread_rng(), pk);
168164

@@ -191,7 +187,6 @@ mod tests {
191187

192188
#[test]
193189
fn can_and_try_add_to_close() {
194-
crypto_init().unwrap();
195190
let pk = PublicKey([0; PUBLICKEYBYTES]);
196191
let mut friend = DhtFriend::new(&mut thread_rng(), pk);
197192

tox_core/src/dht/forced_ktree.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ mod tests {
279279

280280
#[test]
281281
fn forced_ktree_contains() {
282-
crypto_init().unwrap();
283282
let (pk, _) = gen_keypair();
284283
let mut ktree = ForcedKtree::new(&pk);
285284

@@ -309,7 +308,6 @@ mod tests {
309308

310309
#[test]
311310
fn forced_ktree_can_add() {
312-
crypto_init().unwrap();
313311
let pk = PublicKey([0; PUBLICKEYBYTES]);
314312
let mut ktree = ForcedKtree::new(&pk);
315313

@@ -412,7 +410,6 @@ mod tests {
412410

413411
#[tokio::test]
414412
async fn forced_ktree_is_all_discarded() {
415-
crypto_init().unwrap();
416413
let (pk, _) = gen_keypair();
417414
let mut ktree = ForcedKtree::new(&pk);
418415

tox_core/src/dht/kbucket.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,6 @@ mod tests {
613613

614614
#[test]
615615
fn kbucket_get_node() {
616-
crypto_init().unwrap();
617616
let (pk, _) = gen_keypair();
618617
let mut kbucket = Kbucket::<DhtNode>::new(KBUCKET_DEFAULT_SIZE);
619618

@@ -630,7 +629,6 @@ mod tests {
630629

631630
#[test]
632631
fn kbucket_get_node_mut() {
633-
crypto_init().unwrap();
634632
let (pk, _) = gen_keypair();
635633
let mut kbucket = Kbucket::<DhtNode>::new(KBUCKET_DEFAULT_SIZE);
636634

tox_core/src/dht/ktree.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ mod tests {
213213

214214
#[test]
215215
fn ktree_new() {
216-
crypto_init().unwrap();
217216
let pk = gen_keypair().0;
218217
let ktree = Ktree::new(&pk);
219218
assert_eq!(pk, ktree.pk);
@@ -326,7 +325,6 @@ mod tests {
326325

327326
#[test]
328327
fn ktree_contains() {
329-
crypto_init().unwrap();
330328
let (pk, _) = gen_keypair();
331329
let mut ktree = Ktree::new(&pk);
332330

@@ -346,7 +344,6 @@ mod tests {
346344

347345
#[test]
348346
fn ktree_can_add() {
349-
crypto_init().unwrap();
350347
let (pk, _) = gen_keypair();
351348
let mut ktree = Ktree::new(&pk);
352349

@@ -418,7 +415,6 @@ mod tests {
418415

419416
#[tokio::test]
420417
async fn ktree_is_all_discarded() {
421-
crypto_init().unwrap();
422418
let (pk, _) = gen_keypair();
423419
let mut ktree = Ktree::new(&pk);
424420

tox_core/src/dht/lan_discovery.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ mod tests {
175175

176176
#[tokio::test]
177177
async fn send_ipv4() {
178-
crypto_init().unwrap();
179178
// `+1` for 255.255.255.255
180179
let packets_count = (broadcast_addrs_count() + 1) * (PORTS_PER_DISCOVERY + 1) as usize;
181180

@@ -201,7 +200,6 @@ mod tests {
201200

202201
#[tokio::test]
203202
async fn send_ipv6() {
204-
crypto_init().unwrap();
205203
// `+2` for ::1 and ::ffff:255.255.255.255
206204
let packets_count = (broadcast_addrs_count() + 2) * (PORTS_PER_DISCOVERY + 1) as usize;
207205

@@ -227,7 +225,6 @@ mod tests {
227225

228226
#[tokio::test]
229227
async fn cycle_around_ports() {
230-
crypto_init().unwrap();
231228
// `+1` for 255.255.255.255
232229
let packets_count = (broadcast_addrs_count() + 1) * (PORTS_PER_DISCOVERY + 1) as usize;
233230

tox_core/src/dht/server/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,8 +1396,6 @@ mod tests {
13961396

13971397
fn create_node() -> (Server, PrecomputedKey, PublicKey, SecretKey,
13981398
mpsc::Receiver<(Packet, SocketAddr)>, SocketAddr) {
1399-
crypto_init().unwrap();
1400-
14011399
let (pk, sk) = gen_keypair();
14021400
let (tx, rx) = mpsc::channel(32);
14031401
let alice = Server::new(tx, pk, sk);

0 commit comments

Comments
 (0)