From 5f8100ebadc0728cbdb6a7b122ddfebe9adfeacb Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Mon, 28 Jun 2021 14:58:53 +0100
Subject: [PATCH] Nothing

---
 crates/librqbit/src/peer_connection.rs |  6 ++--
 crates/librqbit/src/peer_state.rs      |  6 ++--
 crates/librqbit/src/torrent_state.rs   | 39 ++++++++------------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/crates/librqbit/src/peer_connection.rs b/crates/librqbit/src/peer_connection.rs
index 49243de..8a317f2 100644
--- a/crates/librqbit/src/peer_connection.rs
+++ b/crates/librqbit/src/peer_connection.rs
@@ -405,7 +405,7 @@ impl PeerConnection {
                 None => return Ok(()),
             };
             let sem = match self.state.locked.read().peers.get_live(handle) {
-                Some(live) => live.outstanding_requests.clone(),
+                Some(live) => live.requests_sem.clone(),
                 None => return Ok(()),
             };
             for chunk in self.state.lengths.iter_chunk_infos(next) {
@@ -451,7 +451,7 @@ impl PeerConnection {
         };
         live.i_am_choked = false;
         live.have_notify.notify_waiters();
-        live.outstanding_requests.add_permits(16);
+        live.requests_sem.add_permits(16);
     }
 
     fn on_received_piece(
@@ -472,7 +472,7 @@ impl PeerConnection {
 
         let mut g = self.state.locked.write();
         let h = g.peers.try_get_live_mut(handle)?;
-        h.outstanding_requests.add_permits(1);
+        h.requests_sem.add_permits(1);
 
         self.state
             .stats
diff --git a/crates/librqbit/src/peer_state.rs b/crates/librqbit/src/peer_state.rs
index 2f22fb8..aea0f06 100644
--- a/crates/librqbit/src/peer_state.rs
+++ b/crates/librqbit/src/peer_state.rs
@@ -12,9 +12,8 @@ pub enum PeerState {
 pub struct LivePeerState {
     pub peer_id: [u8; 20],
     pub i_am_choked: bool,
-    pub peer_choked: bool,
     pub peer_interested: bool,
-    pub outstanding_requests: Arc<Semaphore>,
+    pub requests_sem: Arc<Semaphore>,
     pub have_notify: Arc<Notify>,
     pub bitfield: Option<BF>,
     pub inflight_requests: HashSet<InflightRequest>,
@@ -25,11 +24,10 @@ impl LivePeerState {
         LivePeerState {
             peer_id: peer_id,
             i_am_choked: true,
-            peer_choked: true,
             peer_interested: false,
             bitfield: None,
             have_notify: Arc::new(Notify::new()),
-            outstanding_requests: Arc::new(Semaphore::new(0)),
+            requests_sem: Arc::new(Semaphore::new(0)),
             inflight_requests: Default::default(),
         }
     }
diff --git a/crates/librqbit/src/torrent_state.rs b/crates/librqbit/src/torrent_state.rs
index 963aa6e..f2937e8 100644
--- a/crates/librqbit/src/torrent_state.rs
+++ b/crates/librqbit/src/torrent_state.rs
@@ -114,29 +114,21 @@ impl PeerStates {
         result
     }
     pub fn mark_i_am_choked(&mut self, handle: PeerHandle, is_choked: bool) -> Option<bool> {
-        match self.states.get_mut(&handle) {
-            Some(PeerState::Live(live)) => {
-                let prev = live.i_am_choked;
-                live.i_am_choked = is_choked;
-                return Some(prev);
-            }
-            _ => return None,
-        }
+        let live = self.get_live_mut(handle)?;
+        let prev = live.i_am_choked;
+        live.i_am_choked = is_choked;
+        Some(prev)
     }
     pub fn update_bitfield_from_vec(
         &mut self,
         handle: PeerHandle,
         bitfield: Vec<u8>,
     ) -> Option<Option<BF>> {
-        match self.states.get_mut(&handle) {
-            Some(PeerState::Live(live)) => {
-                let bitfield = BF::from_vec(bitfield);
-                let prev = live.bitfield.take();
-                live.bitfield = Some(bitfield);
-                Some(prev)
-            }
-            _ => None,
-        }
+        let live = self.get_live_mut(handle)?;
+        let bitfield = BF::from_vec(bitfield);
+        let prev = live.bitfield.take();
+        live.bitfield = Some(bitfield);
+        Some(prev)
     }
     pub fn clone_tx(&self, handle: PeerHandle) -> Option<Arc<Sender<MessageOwned>>> {
         Some(self.tx.get(&handle)?.clone())
@@ -223,10 +215,7 @@ impl TorrentState {
 
     pub fn get_next_needed_piece(&self, peer_handle: PeerHandle) -> Option<ValidPieceIndex> {
         let g = self.locked.read();
-        let bf = match g.peers.states.get(&peer_handle)? {
-            PeerState::Live(l) => l.bitfield.as_ref()?,
-            _ => return None,
-        };
+        let bf = g.peers.get_live(peer_handle)?.bitfield.as_ref()?;
         for n in g.chunks.get_needed_pieces().iter_ones() {
             if bf.get(n).map(|v| *v) == Some(true) {
                 // in theory it should be safe without validation, but whatever.
@@ -240,12 +229,8 @@ impl TorrentState {
         self.locked
             .read()
             .peers
-            .states
-            .get(&peer_handle)
-            .and_then(|s| match s {
-                PeerState::Live(l) => Some(l.i_am_choked),
-                _ => None,
-            })
+            .get_live(peer_handle)
+            .map(|l| l.i_am_choked)
     }
 
     pub fn reserve_next_needed_piece(&self, peer_handle: PeerHandle) -> Option<ValidPieceIndex> {