Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions src/tracker/peer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,9 @@ mod test {

use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};

use crate::{
peer::TorrentPeer,
protocol::clock::{DefaultClock, Time},
PeerId,
};
use crate::peer::TorrentPeer;
use crate::protocol::clock::{DefaultClock, Time};
use crate::PeerId;

#[test]
fn it_should_be_serializable() {
Expand Down Expand Up @@ -131,9 +129,8 @@ mod test {
AnnounceEvent, AnnounceRequest, NumberOfBytes, NumberOfPeers, PeerId as AquaticPeerId, PeerKey, Port, TransactionId,
};

use crate::protocol::utils::get_connection_id;

use crate::peer::TorrentPeer;
use crate::protocol::utils::get_connection_id;

// todo: duplicate functions is PR 82. Remove duplication once both PR are merged.

Expand Down Expand Up @@ -201,12 +198,11 @@ mod test {

mod when_source_udp_ip_is_a_ipv_4_loopback_ip {

use std::{
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
str::FromStr,
};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use std::str::FromStr;

use crate::peer::{test::torrent_peer_constructor_from_udp_requests::AnnounceRequestBuilder, TorrentPeer};
use crate::peer::test::torrent_peer_constructor_from_udp_requests::AnnounceRequestBuilder;
use crate::peer::TorrentPeer;

#[test]
fn it_should_use_the_loopback_ip_if_the_server_does_not_have_the_external_ip_configuration() {
Expand Down Expand Up @@ -243,12 +239,11 @@ mod test {

mod when_source_udp_ip_is_a_ipv6_loopback_ip {

use std::{
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
str::FromStr,
};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use std::str::FromStr;

use crate::peer::{test::torrent_peer_constructor_from_udp_requests::AnnounceRequestBuilder, TorrentPeer};
use crate::peer::test::torrent_peer_constructor_from_udp_requests::AnnounceRequestBuilder;
use crate::peer::TorrentPeer;

#[test]
fn it_should_use_the_loopback_ip_if_the_server_does_not_have_the_external_ip_configuration() {
Expand Down Expand Up @@ -285,10 +280,12 @@ mod test {
}

mod torrent_peer_constructor_from_for_http_requests {
use crate::{http::AnnounceRequest, peer::TorrentPeer, InfoHash, PeerId};

use std::net::{IpAddr, Ipv4Addr};

use crate::http::AnnounceRequest;
use crate::peer::TorrentPeer;
use crate::{InfoHash, PeerId};

fn sample_http_announce_request(peer_addr: IpAddr, port: u16) -> AnnounceRequest {
AnnounceRequest {
info_hash: InfoHash([0u8; 20]),
Expand Down
3 changes: 2 additions & 1 deletion src/tracker/statistics.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use async_trait::async_trait;
use std::sync::Arc;

use async_trait::async_trait;
use tokio::sync::mpsc::error::SendError;
use tokio::sync::mpsc::Sender;
use tokio::sync::{mpsc, RwLock, RwLockReadGuard};
Expand Down
18 changes: 7 additions & 11 deletions src/tracker/torrent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,16 @@ pub enum TorrentError {

#[cfg(test)]
mod tests {
use std::{
net::{IpAddr, Ipv4Addr, SocketAddr},
ops::Sub,
time::Duration,
};
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use std::ops::Sub;
use std::time::Duration;

use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};

use crate::{
peer::TorrentPeer,
protocol::clock::{DefaultClock, DurationSinceUnixEpoch, StoppedClock, StoppedTime, Time, WorkingClock},
torrent::TorrentEntry,
PeerId,
};
use crate::peer::TorrentPeer;
use crate::protocol::clock::{DefaultClock, DurationSinceUnixEpoch, StoppedClock, StoppedTime, Time, WorkingClock};
use crate::torrent::TorrentEntry;
use crate::PeerId;

struct TorrentPeerBuilder {
peer: TorrentPeer,
Expand Down
Loading