fix: review issues

Signed-off-by: Dmitriy Khaustov aka xDimon <[email protected]>

Author: xDimon

include/scale/scale_decoder_stream.hpp

@@ -17,9 +17,12 @@
 #include <boost/variant.hpp>
 
 #include <scale/bitvec.hpp>
-#include <scale/detail/compact_integer.hpp>
 #include <scale/detail/fixed_width_integer.hpp>
+#ifdef JAM_COMPATIBILITY_ENABLED
 #include <scale/detail/jam_compact_integer.hpp>
+#else
+#include <scale/detail/compact_integer.hpp>
+#endif
 #include <scale/scale_error.hpp>
 #include <scale/types.hpp>
 #include <type_traits>
@@ -370,8 +373,8 @@ namespace scale {
       if (not config_.has_value()) {
         throw std::runtime_error("Stream created without any custom config");
       }
-      if (config_.type().hash_code()
-          != typeid(std::reference_wrapper<const T>).hash_code()) {
+      if (config_.type()
+          != typeid(std::reference_wrapper<const T>)) {
         throw std::runtime_error("Stream created with other custom config");
       }
       return std::any_cast<std::reference_wrapper<const T>>(config_).get();
@@ -380,7 +383,7 @@ namespace scale {
     template <typename T>
     [[deprecated("Scale has compiled without custom config support")]]  //
     const T &
-    getConfig_() const = delete;
+    getConfig() const = delete;
 #endif
 
    private:

include/scale/scale_encoder_stream.hpp

@@ -16,9 +16,12 @@
 #include <boost/variant.hpp>
 
 #include <scale/bitvec.hpp>
-#include <scale/detail/compact_integer.hpp>
 #include <scale/detail/fixed_width_integer.hpp>
+#ifdef JAM_COMPATIBILITY_ENABLED
 #include <scale/detail/jam_compact_integer.hpp>
+#else
+#include <scale/detail/compact_integer.hpp>
+#endif
 #include <scale/scale_error.hpp>
 #include <scale/tune.hpp>
 #include <scale/types.hpp>
@@ -259,8 +262,8 @@ namespace scale {
       if (not config_.has_value()) {
         throw std::runtime_error("Stream created without any custom config");
       }
-      if (config_.type().hash_code()
-          != typeid(std::reference_wrapper<const T>).hash_code()) {
+      if (config_.type()
+          != typeid(std::reference_wrapper<const T>)) {
         throw std::runtime_error("Stream created with other custom config");
       }
       return std::any_cast<std::reference_wrapper<const T>>(config_).get();
@@ -356,4 +359,4 @@ namespace scale {
     return s << static_cast<std::underlying_type_t<E>>(v);
   }
 
-}  // namespace scale
+}  // namespace scale

src/scale_decoder_stream.cpp

@@ -6,9 +6,6 @@
 
 #include <scale/scale_decoder_stream.hpp>
 
-#include <scale/detail/fixed_width_integer.hpp>
-#include <scale/detail/jam_compact_integer.hpp>
-
 namespace scale {
   size_t ScaleDecoderStream::decodeLength() {
 #ifdef JAM_COMPATIBILITY_ENABLED

src/scale_encoder_stream.cpp

@@ -6,9 +6,6 @@
 
 #include <scale/scale_encoder_stream.hpp>
 
-#include <scale/detail/fixed_width_integer.hpp>
-#include <scale/detail/jam_compact_integer.hpp>
-
 namespace scale {
   ScaleEncoderStream::ScaleEncoderStream()
       : drop_data_{false}, bytes_written_{0} {}