From abfd47a4a8ccf18f65014fb0adc134540cfaada4 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Thu, 24 Feb 2022 12:14:46 -0600
Subject: [PATCH] refactor: remove unused tr_block_info.n_blocks_in_piece
 (#2704)

---
 libtransmission/block-info.cc            | 7 -------
 libtransmission/block-info.h             | 4 +---
 tests/libtransmission/block-info-test.cc | 6 ------
 tests/libtransmission/completion-test.cc | 4 +---
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/libtransmission/block-info.cc b/libtransmission/block-info.cc
index ed92e0d4d..1b588df1a 100644
--- a/libtransmission/block-info.cc
+++ b/libtransmission/block-info.cc
@@ -32,8 +32,6 @@ void tr_block_info::initSizes(uint64_t total_size_in, uint64_t piece_size_in)
     final_block_size = remainder != 0U ? remainder : BlockSize;
 
     n_blocks = (total_size + BlockSize - 1) / BlockSize;
-    n_blocks_in_piece = piece_size / BlockSize;
-    n_blocks_in_final_piece = (final_piece_size + BlockSize - 1) / BlockSize;
 
 #ifdef TR_ENABLE_ASSERTS
     uint64_t t = n_pieces - 1;
@@ -45,10 +43,5 @@ void tr_block_info::initSizes(uint64_t total_size_in, uint64_t piece_size_in)
     t *= BlockSize;
     t += final_block_size;
     TR_ASSERT(t == total_size);
-
-    t = n_pieces - 1;
-    t *= n_blocks_in_piece;
-    t += n_blocks_in_final_piece;
-    TR_ASSERT(t == n_blocks);
 #endif
 }
diff --git a/libtransmission/block-info.h b/libtransmission/block-info.h
index a5206a8f9..539bba9f0 100644
--- a/libtransmission/block-info.h
+++ b/libtransmission/block-info.h
@@ -18,8 +18,6 @@ struct tr_block_info
     uint64_t n_pieces = 0;
 
     tr_block_index_t n_blocks = 0;
-    tr_block_index_t n_blocks_in_piece = 0;
-    tr_block_index_t n_blocks_in_final_piece = 0;
     uint32_t final_block_size = 0;
     uint32_t final_piece_size = 0;
 
@@ -168,6 +166,6 @@ struct tr_block_info
 private:
     [[nodiscard]] bool constexpr isInitialized() const
     {
-        return n_blocks_in_piece != 0;
+        return piece_size != 0;
     }
 };
diff --git a/tests/libtransmission/block-info-test.cc b/tests/libtransmission/block-info-test.cc
index 6ad64d032..582e0c5c9 100644
--- a/tests/libtransmission/block-info-test.cc
+++ b/tests/libtransmission/block-info-test.cc
@@ -25,8 +25,6 @@ TEST_F(BlockInfoTest, fieldsAreSet)
     info.initSizes(TotalSize, PieceSize);
 
     EXPECT_EQ(ExpectedBlockSize, info.final_block_size);
-    EXPECT_EQ(ExpectedBlocksPerPiece, info.n_blocks_in_final_piece);
-    EXPECT_EQ(ExpectedBlocksPerPiece, info.n_blocks_in_piece);
     EXPECT_EQ(PieceCount, info.n_pieces);
     EXPECT_EQ(PieceSize, info.final_piece_size);
     EXPECT_EQ(PieceSize, info.piece_size);
@@ -34,8 +32,6 @@ TEST_F(BlockInfoTest, fieldsAreSet)
 
     info.initSizes(0, 0);
     EXPECT_EQ(0, info.final_block_size);
-    EXPECT_EQ(0, info.n_blocks_in_final_piece);
-    EXPECT_EQ(0, info.n_blocks_in_piece);
     EXPECT_EQ(0, info.n_pieces);
     EXPECT_EQ(0, info.final_piece_size);
     EXPECT_EQ(0, info.piece_size);
@@ -55,8 +51,6 @@ TEST_F(BlockInfoTest, handlesOddSize)
 
     EXPECT_EQ(1, info.final_block_size);
     EXPECT_EQ(1, info.final_piece_size);
-    EXPECT_EQ(1, info.n_blocks_in_final_piece);
-    EXPECT_EQ(ExpectedBlocksPerPiece, info.n_blocks_in_piece);
     EXPECT_EQ(PieceCount, info.n_pieces);
     EXPECT_EQ(PieceSize, info.piece_size);
     EXPECT_EQ(TotalSize, info.total_size);
diff --git a/tests/libtransmission/completion-test.cc b/tests/libtransmission/completion-test.cc
index 2447d25e6..afca674e8 100644
--- a/tests/libtransmission/completion-test.cc
+++ b/tests/libtransmission/completion-test.cc
@@ -152,7 +152,7 @@ TEST_F(CompletionTest, hasPiece)
     EXPECT_EQ(0, completion.hasValid());
 
     // check that adding all the blocks in a piece means we have it
-    for (size_t i = 1; i < block_info.n_blocks_in_piece; ++i)
+    for (tr_block_index_t i = 1, n = block_info.pieceLoc(1).block; i < n; ++i)
     {
         completion.addBlock(i);
     }
@@ -377,7 +377,6 @@ TEST_F(CompletionTest, countMissingBytesInPiece)
     completion.addBlock(final_block);
     EXPECT_EQ(1, block_info.final_piece_size);
     EXPECT_EQ(1, block_info.final_block_size);
-    EXPECT_EQ(1, block_info.n_blocks_in_final_piece);
     EXPECT_TRUE(completion.hasPiece(final_piece));
     EXPECT_EQ(0, completion.countMissingBytesInPiece(final_piece));
 }
@@ -403,7 +402,6 @@ TEST_F(CompletionTest, amountDone)
     // one block
     completion.addBlock(0);
     completion.amountDone(std::data(bins), std::size(bins));
-    EXPECT_DOUBLE_EQ(1.0 / block_info.n_blocks_in_piece, bins[0]);
     EXPECT_DOUBLE_EQ(0.0, bins[1]);
 
     // one piece