From 2c78f4dd1f52200e7061b809bb472dbcd499962e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 21 Dec 2021 18:29:52 +0100
Subject: Core/Misc: Resolve c++17 TODOs left in code as comments

---
 src/common/Cryptography/CryptoHash.h | 41 ++++++++--------------------------
 src/common/Cryptography/HMAC.h       | 43 +++++++++---------------------------
 src/common/Utilities/advstd.h        | 29 ------------------------
 3 files changed, 19 insertions(+), 94 deletions(-)

(limited to 'src/common')

diff --git a/src/common/Cryptography/CryptoHash.h b/src/common/Cryptography/CryptoHash.h
index 991bf15944e..8e6f2b32394 100644
--- a/src/common/Cryptography/CryptoHash.h
+++ b/src/common/Cryptography/CryptoHash.h
@@ -23,16 +23,12 @@
 #include "Errors.h"
 #include <array>
 #include <string>
-//#include <string_view>
+#include <string_view>
 #include <openssl/evp.h>
-#include <cstring>
-#include "advstd.h" // data/size
 
 class BigNumber;
 
-namespace Trinity
-{
-namespace Impl
+namespace Trinity::Impl
 {
     struct GenericHashImpl
     {
@@ -62,26 +58,11 @@ namespace Impl
                 return hash.GetDigest();
             }
 
-        private: // c++17
-            template <typename T>
-            static void UpdateData_OLDCPP(GenericHash& hash, T const& data)
-            {
-                hash.UpdateData(data);
-            }
-
-            template <typename T, typename... TRest>
-            static void UpdateData_OLDCPP(GenericHash& hash, T const& data, TRest&&... rest)
-            {
-                hash.UpdateData(data);
-                UpdateData_OLDCPP(hash, std::forward<TRest>(rest)...);
-            }
-
-        public:
             template <typename... Ts>
-            static auto GetDigestOf(Ts&&... pack) -> std::enable_if_t<advstd::conjunction<advstd::negation<std::is_integral<Ts>>...>::value, Digest>
+            static auto GetDigestOf(Ts&&... pack) -> std::enable_if_t<std::conjunction_v<std::negation<std::is_integral<Ts>>...>, Digest>
             {
                 GenericHash hash;
-                UpdateData_OLDCPP(hash, std::forward<Ts>(pack)...);
+                (hash.UpdateData(std::forward<Ts>(pack)), ...);
                 hash.Finalize();
                 return hash.GetDigest();
             }
@@ -105,11 +86,11 @@ namespace Impl
                 int result = EVP_DigestUpdate(_ctx, data, len);
                 ASSERT(result == 1);
             }
-            // c++17 void UpdateData(std::string_view str) { UpdateData(reinterpret_cast<uint8 const*>(str.data()), str.size()); }
-            void UpdateData(std::string const& str) { UpdateData(str.c_str()); } /* explicit overload to avoid using the container template */
-            void UpdateData(char const* str) { UpdateData(reinterpret_cast<uint8 const*>(str), strlen(str)); } /* explicit overload to avoid using the container template */
+            void UpdateData(std::string_view str) { UpdateData(reinterpret_cast<uint8 const*>(str.data()), str.size()); }
+            void UpdateData(std::string const& str) { UpdateData(std::string_view(str)); } /* explicit overload to avoid using the container template */
+            void UpdateData(char const* str) { UpdateData(std::string_view(str)); } /* explicit overload to avoid using the container template */
             template <typename Container>
-            void UpdateData(Container const& c) { UpdateData(advstd::data(c), advstd::size(c)); }
+            void UpdateData(Container const& c) { UpdateData(std::data(c), std::size(c)); }
 
             void Finalize()
             {
@@ -128,15 +109,11 @@ namespace Impl
             Digest _digest = { };
     };
 }
-}
 
-namespace Trinity
-{
-namespace Crypto
+namespace Trinity::Crypto
 {
     using SHA1 = Trinity::Impl::GenericHash<EVP_sha1, Constants::SHA1_DIGEST_LENGTH_BYTES>;
     using SHA256 = Trinity::Impl::GenericHash<EVP_sha256, Constants::SHA256_DIGEST_LENGTH_BYTES>;
 }
-}
 
 #endif
diff --git a/src/common/Cryptography/HMAC.h b/src/common/Cryptography/HMAC.h
index 6b9d2a081bd..7925fb23a61 100644
--- a/src/common/Cryptography/HMAC.h
+++ b/src/common/Cryptography/HMAC.h
@@ -23,15 +23,12 @@
 #include "Errors.h"
 #include <array>
 #include <string>
-//#include <string_view>
+#include <string_view>
 #include <openssl/hmac.h>
-#include "advstd.h"
 
 class BigNumber;
 
-namespace Trinity
-{
-namespace Impl
+namespace Trinity::Impl
 {
     struct HMACImpl
     {
@@ -72,26 +69,11 @@ namespace Impl
                 return hash.GetDigest();
             }
 
-        private: // c++17
-            template <typename T>
-            static void UpdateData_OLDCPP(GenericHMAC& hash, T const& data)
-            {
-                hash.UpdateData(data);
-            }
-
-            template <typename T, typename... TRest>
-            static void UpdateData_OLDCPP(GenericHMAC& hash, T const& data, TRest&&... rest)
-            {
-                hash.UpdateData(data);
-                UpdateData_OLDCPP(hash, std::forward<TRest>(rest)...);
-            }
-
-        public:
             template <typename Container, typename... Ts>
-            static auto GetDigestOf(Container const& seed, Ts&&... pack) -> std::enable_if_t<advstd::conjunction<advstd::negation<std::is_integral<Ts>>...>::value, Digest>
+            static auto GetDigestOf(Container const& seed, Ts&&... pack) -> std::enable_if_t<std::conjunction_v<std::negation<std::is_integral<Ts>>...>, Digest>
             {
                 GenericHMAC hash(seed);
-                UpdateData_OLDCPP(hash, std::forward<Ts>(pack)...);
+                (hash.UpdateData(std::forward<Ts>(pack)), ...);
                 hash.Finalize();
                 return hash.GetDigest();
             }
@@ -102,7 +84,7 @@ namespace Impl
                 ASSERT(result == 1);
             }
             template <typename Container>
-            GenericHMAC(Container const& container) : GenericHMAC(container.data(), container.size()) {}
+            GenericHMAC(Container const& container) : GenericHMAC(std::data(container), std::size(container)) {}
 
             ~GenericHMAC()
             {
@@ -117,11 +99,11 @@ namespace Impl
                 int result = HMAC_Update(_ctx, data, len);
                 ASSERT(result == 1);
             }
-            // c++17 void UpdateData(std::string_view str) { UpdateData(reinterpret_cast<uint8 const*>(str.data()), str.size()); }
-            void UpdateData(std::string const& str) { UpdateData(str.c_str()); } /* explicit overload to avoid using the container template */
-            void UpdateData(char const* str) { UpdateData(reinterpret_cast<uint8 const*>(str), strlen(str)); } /* explicit overload to avoid using the container template */
+            void UpdateData(std::string_view str) { UpdateData(reinterpret_cast<uint8 const*>(str.data()), str.size()); }
+            void UpdateData(std::string const& str) { UpdateData(std::string_view(str)); } /* explicit overload to avoid using the container template */
+            void UpdateData(char const* str) { UpdateData(std::string_view(str)); } /* explicit overload to avoid using the container template */
             template <typename Container>
-            void UpdateData(Container const& c) { UpdateData(advstd::data(c), advstd::size(c)); }
+            void UpdateData(Container const& c) { UpdateData(std::data(c), std::size(c)); }
 
             void Finalize()
             {
@@ -139,15 +121,10 @@ namespace Impl
             Digest _digest = { };
     };
 }
-}
 
-namespace Trinity
-{
-namespace Crypto
+namespace Trinity::Crypto
 {
     using HMAC_SHA1 = Trinity::Impl::GenericHMAC<EVP_sha1, Constants::SHA1_DIGEST_LENGTH_BYTES>;
     using HMAC_SHA256 = Trinity::Impl::GenericHMAC<EVP_sha256, Constants::SHA256_DIGEST_LENGTH_BYTES>;
 }
-}
-
 #endif
diff --git a/src/common/Utilities/advstd.h b/src/common/Utilities/advstd.h
index 975fc2c85ad..a39e0baadc1 100644
--- a/src/common/Utilities/advstd.h
+++ b/src/common/Utilities/advstd.h
@@ -133,35 +133,6 @@ namespace advstd
     // C++20 std::remove_cvref_t
     template <class T>
     using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;
-
-    template<typename B>
-    struct negation : std::integral_constant<bool, !bool(B::value)> { };
-
-    template <typename...>
-    struct conjunction : std::true_type { };
-    template <typename B1>
-    struct conjunction<B1> : B1 { };
-    template <typename B1, class... Bn>
-    struct conjunction<B1, Bn...> : std::conditional_t<bool(B1::value), conjunction<Bn...>, B1> { };
-
-    template <typename...>
-    struct disjunction : std::false_type { };
-    template <typename B1>
-    struct disjunction<B1> : B1 { };
-    template <typename B1, class... Bn>
-    struct disjunction<B1, Bn...> : std::conditional_t<bool(B1::value), B1, disjunction<Bn...>>  { };
-
-    template <class T>
-    constexpr T const& clamp(T const& val, T const& lo, T const& hi)
-    {
-        if (hi < val)
-            return hi;
-
-        if (val < lo)
-            return lo;
-
-        return val;
-    }
 }
 
 #endif
-- 
cgit v1.2.3