From e843209aa9453bbbbbe440581c6074a981bec73c Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Wed, 30 Jun 2021 00:00:44 +0100
Subject: [PATCH] nothing

---
 crates/librqbit/src/peer_connection.rs |  3 ++-
 crates/librqbit/src/peer_state.rs      | 20 +++++++++++++++++++-
 crates/librqbit/src/torrent_state.rs   | 17 +----------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/crates/librqbit/src/peer_connection.rs b/crates/librqbit/src/peer_connection.rs
index 53bf286..908b062 100644
--- a/crates/librqbit/src/peer_connection.rs
+++ b/crates/librqbit/src/peer_connection.rs
@@ -18,8 +18,9 @@ use crate::{
         MessageOwned, Piece, Request, PIECE_MESSAGE_DEFAULT_LEN,
     },
     peer_id::try_decode_peer_id,
+    peer_state::InflightRequest,
     spawn_utils::{spawn, spawn_block_in_place},
-    torrent_state::{InflightRequest, TorrentState},
+    torrent_state::TorrentState,
     type_aliases::PeerHandle,
 };
 
diff --git a/crates/librqbit/src/peer_state.rs b/crates/librqbit/src/peer_state.rs
index aea0f06..150b147 100644
--- a/crates/librqbit/src/peer_state.rs
+++ b/crates/librqbit/src/peer_state.rs
@@ -2,7 +2,25 @@ use std::{collections::HashSet, net::SocketAddr, sync::Arc};
 
 use tokio::sync::{Notify, Semaphore};
 
-use crate::{torrent_state::InflightRequest, type_aliases::BF};
+use crate::{
+    lengths::{ChunkInfo, ValidPieceIndex},
+    type_aliases::BF,
+};
+
+#[derive(Debug, Hash, PartialEq, Eq)]
+pub struct InflightRequest {
+    pub piece: ValidPieceIndex,
+    pub chunk: u32,
+}
+
+impl From<&ChunkInfo> for InflightRequest {
+    fn from(c: &ChunkInfo) -> Self {
+        Self {
+            piece: c.piece_index,
+            chunk: c.chunk_index,
+        }
+    }
+}
 
 pub enum PeerState {
     Connecting(SocketAddr),
diff --git a/crates/librqbit/src/torrent_state.rs b/crates/librqbit/src/torrent_state.rs
index 75ec3d4..217fd9c 100644
--- a/crates/librqbit/src/torrent_state.rs
+++ b/crates/librqbit/src/torrent_state.rs
@@ -16,7 +16,7 @@ use tokio::sync::mpsc::{channel, Sender};
 use crate::{
     chunk_tracker::ChunkTracker,
     file_ops::FileOps,
-    lengths::{ChunkInfo, Lengths, ValidPieceIndex},
+    lengths::{Lengths, ValidPieceIndex},
     peer_binary_protocol::{Handshake, Message},
     peer_connection::{PeerConnection, WriterRequest},
     peer_state::{LivePeerState, PeerState},
@@ -25,21 +25,6 @@ use crate::{
     type_aliases::{PeerHandle, BF},
 };
 
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub struct InflightRequest {
-    pub piece: ValidPieceIndex,
-    pub chunk: u32,
-}
-
-impl From<&ChunkInfo> for InflightRequest {
-    fn from(c: &ChunkInfo) -> Self {
-        Self {
-            piece: c.piece_index,
-            chunk: c.chunk_index,
-        }
-    }
-}
-
 #[derive(Default)]
 pub struct PeerStates {
     states: HashMap<PeerHandle, PeerState>,