From 43bb4bc1c8aeea61d64a43d0d630774e03a57494 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Sat, 21 Jan 2023 17:53:58 -0600
Subject: [PATCH] refactor: remove unused declarations from tr-macros.h (#4630)

---
 libtransmission/crypto-utils.cc       | 10 +++++++---
 libtransmission/tr-macros.h           |  7 +------
 tests/libtransmission/session-test.cc |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libtransmission/crypto-utils.cc b/libtransmission/crypto-utils.cc
index 2d6b57f0c..1236ce740 100644
--- a/libtransmission/crypto-utils.cc
+++ b/libtransmission/crypto-utils.cc
@@ -33,10 +33,14 @@ using namespace std::literals;
 
 namespace
 {
+constexpr auto TrSha1DigestStrlen = size_t{ 40 };
+
+constexpr auto TrSha256DigestStrlen = size_t{ 64 };
+
 namespace ssha1_impl
 {
 
-auto constexpr DigestStringSize = TR_SHA1_DIGEST_STRLEN;
+auto constexpr DigestStringSize = TrSha1DigestStrlen;
 auto constexpr SaltedPrefix = "{"sv;
 
 std::string tr_salt(std::string_view plaintext, std::string_view salt)
@@ -210,7 +214,7 @@ std::optional<tr_sha1_digest_t> tr_sha1_from_string(std::string_view hex)
 {
     using namespace hex_impl;
 
-    if (std::size(hex) != TR_SHA1_DIGEST_STRLEN)
+    if (std::size(hex) != TrSha1DigestStrlen)
     {
         return {};
     }
@@ -229,7 +233,7 @@ std::optional<tr_sha256_digest_t> tr_sha256_from_string(std::string_view hex)
 {
     using namespace hex_impl;
 
-    if (std::size(hex) != TR_SHA256_DIGEST_STRLEN)
+    if (std::size(hex) != TrSha256DigestStrlen)
     {
         return {};
     }
diff --git a/libtransmission/tr-macros.h b/libtransmission/tr-macros.h
index a5fd39367..36af60a53 100644
--- a/libtransmission/tr-macros.h
+++ b/libtransmission/tr-macros.h
@@ -103,13 +103,8 @@ using tr_announce_key_t = uint32_t;
 // A string of length 20 which this downloader uses as its id. Each
 // downloader generates its own id at random at the start of a new
 // download. This value will also almost certainly have to be escaped.
-auto inline constexpr PEER_ID_LEN = size_t{ 20 };
-using tr_peer_id_t = std::array<char, PEER_ID_LEN>;
+using tr_peer_id_t = std::array<char, 20>;
 
-auto inline constexpr TR_SHA1_DIGEST_STRLEN = size_t{ 40 };
 using tr_sha1_digest_t = std::array<std::byte, 20>;
-using tr_sha1_digest_string_t = std::array<char, TR_SHA1_DIGEST_STRLEN + 1>; // +1 for '\0'
 
-auto inline constexpr TR_SHA256_DIGEST_STRLEN = size_t{ 64 };
 using tr_sha256_digest_t = std::array<std::byte, 32>;
-using tr_sha256_digest_string_t = std::array<char, TR_SHA256_DIGEST_STRLEN + 1>; // +1 for '\0'
diff --git a/tests/libtransmission/session-test.cc b/tests/libtransmission/session-test.cc
index 2242a5925..833684856 100644
--- a/tests/libtransmission/session-test.cc
+++ b/tests/libtransmission/session-test.cc
@@ -184,7 +184,7 @@ TEST_F(SessionTest, peerId)
         auto const buf = tr_peerIdInit();
 
         // confirm that it begins with peer_id_prefix
-        auto const peer_id = std::string_view(reinterpret_cast<char const*>(buf.data()), PEER_ID_LEN);
+        auto const peer_id = std::string_view{ reinterpret_cast<char const*>(buf.data()), std::size(buf) };
         EXPECT_EQ(peer_id_prefix, peer_id.substr(0, peer_id_prefix.size()));
 
         // confirm that its total is evenly divisible by 36