fcmp++: remove Boost serialization definitions

Author: jeffro256

src/fcmp_pp/curve_trees.h

@@ -98,13 +98,6 @@ struct OutputPair final
 
     bool operator==(const OutputPair &other) const { return output_pubkey == other.output_pubkey && commitment == other.commitment; }
 
-    template <class Archive>
-    inline void serialize(Archive &a, const unsigned int ver)
-    {
-        a & output_pubkey;
-        a & commitment;
-    }
-
     BEGIN_SERIALIZE_OBJECT()
         FIELD(output_pubkey)
         FIELD(commitment)
@@ -133,14 +126,6 @@ struct OutputContext final
 
     bool operator==(const OutputContext &other) const { return output_id == other.output_id && output_pair == other.output_pair; }
 
-    template <class Archive>
-    inline void serialize(Archive &a, const unsigned int ver)
-    {
-        a & output_id;
-        a & torsion_checked;
-        a & output_pair;
-    }
-
     BEGIN_SERIALIZE_OBJECT()
         FIELD(output_id)
         FIELD(torsion_checked)

src/fcmp_pp/tree_cache.h

@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include "common/unordered_containers_boost_serialization.h"
 #include "cryptonote_config.h"
 #include "cryptonote_basic/cryptonote_basic.h"
 #include "curve_trees.h"
@@ -40,9 +39,6 @@
 #include "serialization/serialization.h"
 #include "tree_sync.h"
 
-#include <boost/serialization/deque.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/serialization/version.hpp>
 #include <deque>
 #include <memory>
 #include <unordered_map>
@@ -72,14 +68,6 @@ struct BlockMeta final
     BlockHash blk_hash;
     uint64_t n_leaf_tuples;
 
-    template <class Archive>
-    inline void serialize(Archive &a, const unsigned int ver)
-    {
-        a & blk_hash;
-        a & blk_idx;
-        a & n_leaf_tuples;
-    }
-
     BEGIN_SERIALIZE_OBJECT()
         FIELD(blk_idx)
         FIELD(blk_hash)
@@ -96,13 +84,6 @@ struct CachedLeafChunk final
     std::vector<OutputPair> leaves;
     uint64_t ref_count;
 
-    template <class Archive>
-    inline void serialize(Archive &a, const unsigned int ver)
-    {
-        a & leaves;
-        a & ref_count;
-    }
-
     BEGIN_SERIALIZE_OBJECT()
         FIELD(leaves)
         FIELD(ref_count)
@@ -114,13 +95,6 @@ struct CachedTreeElemChunk final
     std::vector<crypto::ec_point> tree_elems;
     uint64_t ref_count;
 
-    template <class Archive>
-    inline void serialize(Archive &a, const unsigned int ver)
-    {
-        a & tree_elems;
-        a & ref_count;
-    }
-
     BEGIN_SERIALIZE_OBJECT()
         FIELD(tree_elems)
         FIELD(ref_count)
@@ -135,13 +109,6 @@ struct AssignedLeafIdx final
     void assign_leaf(const LeafIdx idx) { leaf_idx = idx; assigned_leaf_idx = true; }
     void unassign_leaf() { leaf_idx = 0; assigned_leaf_idx = false; }
 
-    template <class Archive>
-    inline void serialize(Archive &a, const unsigned int ver)
-    {
-        a & assigned_leaf_idx;
-        a & leaf_idx;
-    }
-
     BEGIN_SERIALIZE_OBJECT()
         FIELD(assigned_leaf_idx)
         FIELD(leaf_idx)
@@ -289,18 +256,6 @@ class TreeCache final : public TreeSync<C1, C2>
 
 // Serialization
 public:
-    template <class Archive>
-    inline void serialize(Archive &a, const unsigned int ver)
-    {
-        a & m_locked_outputs;
-        a & m_locked_output_refs;
-        a & m_output_count;
-        a & m_registered_outputs;
-        a & m_leaf_cache;
-        a & m_tree_elem_cache;
-        a & m_cached_blocks;
-    }
-
     BEGIN_SERIALIZE_OBJECT()
         VERSION_FIELD(TREE_CACHE_VERSION)
         FIELD(m_locked_outputs)
@@ -320,24 +275,3 @@ using TreeCacheV1 = TreeCache<Selene, Helios>;
 //----------------------------------------------------------------------------------------------------------------------
 }//namespace curve_trees
 }//namespace fcmp_pp
-
-// Since BOOST_CLASS_VERSION does not work for templated class, implement it
-namespace boost
-{
-namespace serialization
-{
-template<typename C1, typename C2>
-struct version<fcmp_pp::curve_trees::TreeCache<C1, C2>>
-{
-    typedef mpl::int_<fcmp_pp::curve_trees::TREE_CACHE_VERSION> type;
-    typedef mpl::integral_c_tag tag;
-    static constexpr int value = version::type::value;
-    BOOST_MPL_ASSERT((
-        boost::mpl::less<
-            boost::mpl::int_<fcmp_pp::curve_trees::TREE_CACHE_VERSION>,
-            boost::mpl::int_<256>
-        >
-    ));
-};
-}
-}

src/wallet/wallet2.h

@@ -900,9 +900,6 @@ namespace tools
         return;
       }
       a & m_background_sync_data;
-      if(ver < 32)
-        return;
-      a & m_tree_cache;
     }
 
     BEGIN_SERIALIZE_OBJECT()
@@ -1645,7 +1642,7 @@ namespace tools
     TreeCacheV1 m_tree_cache;
   };
 }
-BOOST_CLASS_VERSION(tools::wallet2, 32)
+BOOST_CLASS_VERSION(tools::wallet2, 31)
 
 namespace tools
 {