From a52edbcbbe0ae8686ae80a8d70f022aa700dd273 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Apr 2022 15:48:30 -0500 Subject: [PATCH] refactor: remove tr_announce_list.tiers (#2960) --- libtransmission/announce-list.cc | 11 ----------- libtransmission/announce-list.h | 2 -- libtransmission/torrent.h | 5 ----- tests/libtransmission/announce-list-test.cc | 3 --- 4 files changed, 21 deletions(-) diff --git a/libtransmission/announce-list.cc b/libtransmission/announce-list.cc index 0025bbd8b..3ac8e9572 100644 --- a/libtransmission/announce-list.cc +++ b/libtransmission/announce-list.cc @@ -156,17 +156,6 @@ tr_quark tr_announce_list::announceToScrape(tr_quark announce) return TR_KEY_NONE; } -std::set tr_announce_list::tiers() const -{ - auto tiers = std::set{}; - for (auto const& tracker : trackers_) - { - tiers.insert(tracker.tier); - } - - return tiers; -} - tr_tracker_tier_t tr_announce_list::nextTier() const { return std::empty(trackers_) ? 0 : trackers_.back().tier + 1; diff --git a/libtransmission/announce-list.h b/libtransmission/announce-list.h index 35d64caab..21ec1a15f 100644 --- a/libtransmission/announce-list.h +++ b/libtransmission/announce-list.h @@ -87,8 +87,6 @@ public: return trackers_.at(i); } - [[nodiscard]] std::set tiers() const; - [[nodiscard]] tr_tracker_tier_t nextTier() const; [[nodiscard]] bool operator==(tr_announce_list const& that) const diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h index 6f27ea5f5..b31d8300e 100644 --- a/libtransmission/torrent.h +++ b/libtransmission/torrent.h @@ -387,11 +387,6 @@ public: return this->announceList().at(i); } - [[nodiscard]] auto tiers() const - { - return this->announceList().tiers(); - } - [[nodiscard]] auto trackerList() const { return this->announceList().toString(); diff --git a/tests/libtransmission/announce-list-test.cc b/tests/libtransmission/announce-list-test.cc index cf538ac5e..07d5ec905 100644 --- a/tests/libtransmission/announce-list-test.cc +++ b/tests/libtransmission/announce-list-test.cc @@ -135,9 +135,6 @@ TEST_F(AnnounceListTest, canSet) EXPECT_EQ(Urls[0], announce_list.at(0).announce.sv()); EXPECT_EQ(Urls[1], announce_list.at(1).announce.sv()); EXPECT_EQ(Urls[2], announce_list.at(2).announce.sv()); - auto const expected_tiers = std::set(std::begin(Tiers), std::end(Tiers)); - auto const tiers = announce_list.tiers(); - EXPECT_EQ(expected_tiers, tiers); } TEST_F(AnnounceListTest, canSetUnsortedWithBackupsInTiers)