From 2972b0c87bfd1b1596611f31029422f037c5bbdd Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Sat, 30 Mar 2024 14:12:54 +0000
Subject: [PATCH] Remove a redundant method

---
 crates/librqbit/src/chunk_tracker.rs          | 4 ++--
 crates/librqbit/src/torrent_state/live/mod.rs | 9 +++++++--
 crates/librqbit_core/src/lengths.rs           | 9 ---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/crates/librqbit/src/chunk_tracker.rs b/crates/librqbit/src/chunk_tracker.rs
index f37f850..dbaba95 100644
--- a/crates/librqbit/src/chunk_tracker.rs
+++ b/crates/librqbit/src/chunk_tracker.rs
@@ -196,8 +196,8 @@ impl ChunkTracker {
     where
         ByteBuf: AsRef<[u8]>,
     {
-        let chunk_info = self.lengths.chunk_info_from_received_piece(
-            piece.index,
+        let chunk_info = self.lengths.chunk_info_from_received_data(
+            self.lengths.validate_piece_index(piece.index)?,
             piece.begin,
             piece.block.as_ref().len() as u32,
         )?;
diff --git a/crates/librqbit/src/torrent_state/live/mod.rs b/crates/librqbit/src/torrent_state/live/mod.rs
index 4713ec2..85d4f1c 100644
--- a/crates/librqbit/src/torrent_state/live/mod.rs
+++ b/crates/librqbit/src/torrent_state/live/mod.rs
@@ -1225,8 +1225,13 @@ impl PeerHandler {
     }
 
     fn on_received_piece(&self, piece: Piece<ByteBuf>) -> anyhow::Result<()> {
-        let chunk_info = match self.state.lengths.chunk_info_from_received_piece(
-            piece.index,
+        let piece_index = self
+            .state
+            .lengths
+            .validate_piece_index(piece.index)
+            .with_context(|| format!("peer sent an invalid piece {}", piece.index))?;
+        let chunk_info = match self.state.lengths.chunk_info_from_received_data(
+            piece_index,
             piece.begin,
             piece.block.len() as u32,
         ) {
diff --git a/crates/librqbit_core/src/lengths.rs b/crates/librqbit_core/src/lengths.rs
index 6aed5dc..72aaf4d 100644
--- a/crates/librqbit_core/src/lengths.rs
+++ b/crates/librqbit_core/src/lengths.rs
@@ -198,15 +198,6 @@ impl Lengths {
             absolute_index,
         })
     }
-
-    pub fn chunk_info_from_received_piece(
-        &self,
-        index: u32,
-        begin: u32,
-        block_len: u32,
-    ) -> Option<ChunkInfo> {
-        self.chunk_info_from_received_data(self.validate_piece_index(index)?, begin, block_len)
-    }
     pub const fn chunk_range(&self, index: ValidPieceIndex) -> std::ops::Range<usize> {
         let start = index.0 * self.chunks_per_piece;
         let end = start + self.chunks_per_piece(index);