From 213fd5168fd1f9b851c8585322021824e32f0e6b Mon Sep 17 00:00:00 2001
From: Nathaniel <nathan@followmyvote.com>
Date: Wed, 16 Mar 2022 18:59:36 -0500
Subject: [PATCH] Cleanup and organization

Delete a useless and unused overload of raw::unpack

Also, make the new custom serialization bit work for unreflected types
(they still need typename reflection)
---
 include/fc/io/raw.hpp     | 68 ++++++++++++++++++++-------------------
 include/fc/io/raw_fwd.hpp |  1 -
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp
index 3a5a8da..e4d375f 100755
--- a/include/fc/io/raw.hpp
+++ b/include/fc/io/raw.hpp
@@ -199,14 +199,6 @@ namespace fc {
       vi.value = static_cast<uint32_t>(v);
     }
 
-    template<typename Stream, typename T> inline void unpack( Stream& s, const T& vi, uint32_t _max_depth )
-    {
-       FC_ASSERT( _max_depth > 0 );
-       T tmp;
-       fc::raw::unpack( s, tmp, _max_depth - 1 );
-       FC_ASSERT( vi == tmp );
-    }
-
     template<typename Stream> inline void pack( Stream& s, const char* v, uint32_t _max_depth )
     {
        FC_ASSERT( _max_depth > 0 );
@@ -418,40 +410,50 @@ namespace fc {
       };
       template<>
       struct if_reflected<std::true_type> {
-      private:
-        template<typename...> using void_t = void;
-
-        template<typename T, typename=void>
-        struct has_custom_packing : std::false_type {};
-        template<typename T>
-        struct has_custom_packing<T,
-                void_t<decltype(std::declval<const T>().fc_pack(std::declval<fc::datastream<size_t>&>(), 1)),
-                       decltype(std::declval<T>().fc_unpack(std::declval<fc::datastream<size_t>&>(), 1))>>
-           : std::true_type {};
-      public:
-        template<typename Stream, typename T, std::enable_if_t<has_custom_packing<T>::value, bool> = true>
-        static inline void pack( Stream& s, const T& v, uint32_t _max_depth ) {
-          FC_ASSERT( _max_depth > 0 );
-          v.fc_pack( s, _max_depth - 1 );
-        }
-        template<typename Stream, typename T, std::enable_if_t<!has_custom_packing<T>::value, bool> = true>
+        template<typename Stream, typename T>
         static inline void pack( Stream& s, const T& v, uint32_t _max_depth ) {
           FC_ASSERT( _max_depth > 0 );
           if_enum< typename fc::reflector<T>::is_enum >::pack( s, v, _max_depth - 1 );
         }
 
-        template<typename Stream, typename T, std::enable_if_t<has_custom_packing<T>::value, bool> = true>
-        static inline void unpack( Stream& s, T& v, uint32_t _max_depth ) {
-          FC_ASSERT( _max_depth > 0 );
-          v.fc_unpack( s, _max_depth - 1 );
-        }
-        template<typename Stream, typename T, std::enable_if_t<!has_custom_packing<T>::value, bool> = true>
+        template<typename Stream, typename T>
         static inline void unpack( Stream& s, T& v, uint32_t _max_depth ) {
           FC_ASSERT( _max_depth > 0 );
           if_enum< typename fc::reflector<T>::is_enum >::unpack( s, v, _max_depth - 1 );
         }
       };
 
+      template<typename...> using void_t = void;
+
+      template<typename T, typename=void>
+      struct has_custom_packing : std::false_type {};
+      template<typename T>
+      struct has_custom_packing<T,
+              void_t<decltype(std::declval<const T>().fc_pack(std::declval<fc::datastream<size_t>&>(), 1)),
+                     decltype(std::declval<T>().fc_unpack(std::declval<fc::datastream<size_t>&>(), 1))>>
+         : std::true_type {};
+
+      template<typename Stream, typename T, std::enable_if_t<has_custom_packing<T>::value, bool> = true>
+      static inline void pack( Stream& s, const T& v, uint32_t _max_depth ) {
+        FC_ASSERT( _max_depth > 0 );
+        v.fc_pack( s, _max_depth - 1 );
+      }
+      template<typename Stream, typename T, std::enable_if_t<!has_custom_packing<T>::value, bool> = true>
+      static inline void pack( Stream& s, const T& v, uint32_t _max_depth ) {
+        FC_ASSERT( _max_depth > 0 );
+        if_reflected< typename fc::reflector<T>::is_defined >::pack( s, v, _max_depth - 1 );
+      }
+
+      template<typename Stream, typename T, std::enable_if_t<has_custom_packing<T>::value, bool> = true>
+      static inline void unpack( Stream& s, T& v, uint32_t _max_depth ) {
+        FC_ASSERT( _max_depth > 0 );
+        v.fc_unpack( s, _max_depth - 1 );
+      }
+      template<typename Stream, typename T, std::enable_if_t<!has_custom_packing<T>::value, bool> = true>
+      static inline void unpack( Stream& s, T& v, uint32_t _max_depth ) {
+        FC_ASSERT( _max_depth > 0 );
+        if_reflected< typename fc::reflector<T>::is_defined >::unpack( s, v, _max_depth - 1 );
+      }
     } // namesapce detail
 
     template<typename Stream, typename T>
@@ -642,13 +644,13 @@ namespace fc {
     template<typename Stream, typename T>
     void pack( Stream& s, const T& v, uint32_t _max_depth ) {
        FC_ASSERT( _max_depth > 0 );
-       fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::pack( s, v, _max_depth - 1 );
+       fc::raw::detail::pack(s, v, _max_depth);
     }
     template<typename Stream, typename T>
     void unpack( Stream& s, T& v, uint32_t _max_depth )
     { try {
        FC_ASSERT( _max_depth > 0 );
-       fc::raw::detail::if_reflected< typename fc::reflector<T>::is_defined >::unpack( s, v, _max_depth - 1 );
+       fc::raw::detail::unpack(s, v, _max_depth);
     } FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename<T>::name() ) ) }
 
     template<typename T>
diff --git a/include/fc/io/raw_fwd.hpp b/include/fc/io/raw_fwd.hpp
index 42e955a..8a60eaf 100755
--- a/include/fc/io/raw_fwd.hpp
+++ b/include/fc/io/raw_fwd.hpp
@@ -80,7 +80,6 @@ namespace fc {
 
 
     template<typename Stream, typename T> void unpack( Stream& s, fc::optional<T>& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
-    template<typename Stream, typename T> void unpack( Stream& s, const T& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
     template<typename Stream, typename T> void pack( Stream& s, const fc::optional<T>& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
     template<typename Stream, typename T> void pack( Stream& s, const safe<T>& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
     template<typename Stream, typename T> void unpack( Stream& s, fc::safe<T>& v, uint32_t _max_depth=FC_PACK_MAX_DEPTH );