Update rand to 0.8 and rand_distr to 0.4

This commit is contained in:
Joakim Frostegård 2020-12-19 11:24:52 +01:00
parent de3042bf4a
commit e1260d14de
12 changed files with 89 additions and 54 deletions

View file

@ -18,8 +18,8 @@ hashbrown = "0.9"
mimalloc = { version = "0.1", default-features = false }
mio = { version = "0.7", features = ["udp", "os-poll", "os-util"] }
parking_lot = "0.11"
rand = { version = "0.7", features = ["small_rng"] }
rand_distr = "0.3"
rand = { version = "0.8", features = ["small_rng"] }
rand_distr = "0.4"
serde = { version = "1", features = ["derive"] }
socket2 = { version = "0.3", features = ["reuseport"] }

View file

@ -1,6 +1,6 @@
use std::sync::Arc;
use rand_distr::{Standard, Pareto};
use rand_distr::Pareto;
use rand::prelude::*;
use aquatic_udp_protocol::*;
@ -15,7 +15,9 @@ pub fn create_torrent_peer(
info_hashes: &Arc<Vec<InfoHash>>,
connection_id: ConnectionId
) -> TorrentPeer {
let num_scape_hashes = rng.gen_range(1, config.handler.scrape_max_torrents);
let num_scape_hashes = rng.gen_range(
1..config.handler.scrape_max_torrents
);
let mut scrape_hash_indeces = Vec::new();
@ -82,13 +84,7 @@ pub fn create_connect_request(transaction_id: TransactionId) -> Request {
fn random_20_bytes() -> [u8; 20] {
let mut bytes = [0; 20];
for (i, b) in rand::thread_rng()
.sample_iter(&Standard)
.enumerate()
.take(20) {
bytes[i] = b
}
thread_rng().fill_bytes(&mut bytes[..]);
bytes
}