Merge pull request #8686

7a3a593 common: move boost_serialization_helper.h out and cleanup includes (Jeffrey Ryan)

4 files changed, 2 insertions, 127 deletions

diff --git a/src/common/boost_serialization_helper.h b/src/common/boost_serialization_helper.h
deleted file mode 100644
index 4a903107f..000000000
--- a/src/common/boost_serialization_helper.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) 2014-2022, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-
-#pragma once
-
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/archive/portable_binary_oarchive.hpp>
-#include <boost/archive/portable_binary_iarchive.hpp>
-#include <boost/filesystem/operations.hpp>
-
-
-namespace tools
-{
-  template<class t_object>
-  bool serialize_obj_to_file(t_object& obj, const std::string& file_path)
-  {
-    TRY_ENTRY();
-#if defined(_MSC_VER)
-    // Need to know HANDLE of file to call FlushFileBuffers
-    HANDLE data_file_handle = ::CreateFile(file_path.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (INVALID_HANDLE_VALUE == data_file_handle)
-      return false;
-
-    int data_file_descriptor = _open_osfhandle((intptr_t)data_file_handle, 0);
-    if (-1 == data_file_descriptor)
-    {
-      ::CloseHandle(data_file_handle);
-      return false;
-    }
-
-    const std::unique_ptr<FILE, tools::close_file> data_file_file{_fdopen(data_file_descriptor, "wb")};
-    if (nullptr == data_file_file)
-    {
-      // Call CloseHandle is not necessary
-      _close(data_file_descriptor);
-      return false;
-    }
-
-    // HACK: undocumented constructor, this code may not compile
-    std::ofstream data_file(data_file_file.get());
-    if (data_file.fail())
-    {
-      // Call CloseHandle and _close are not necessary
-      return false;
-    }
-#else
-    std::ofstream data_file;
-    data_file.open(file_path , std::ios_base::binary | std::ios_base::out| std::ios::trunc);
-    if (data_file.fail())
-      return false;
-#endif
-
-    boost::archive::portable_binary_oarchive a(data_file);
-    a << obj;
-    if (data_file.fail())
-      return false;
-
-    data_file.flush();
-#if defined(_MSC_VER)
-    // To make sure the file is fully stored on disk
-    ::FlushFileBuffers(data_file_handle);
-#endif
-
-    return true;
-    CATCH_ENTRY_L0("serialize_obj_to_file", false);
-  }
-
-  template<class t_object>
-  bool unserialize_obj_from_file(t_object& obj, const std::string& file_path)
-  {
-    TRY_ENTRY();
-
-    std::ifstream data_file;  
-    data_file.open( file_path, std::ios_base::binary | std::ios_base::in);
-    if(data_file.fail())
-      return false;
-    try
-    {
-      // first try reading in portable mode
-      boost::archive::portable_binary_iarchive a(data_file);
-      a >> obj;
-    }
-    catch(...)
-    {
-      // if failed, try reading in unportable mode
-      boost::filesystem::copy_file(file_path, file_path + ".unportable", boost::filesystem::copy_option::overwrite_if_exists);
-      data_file.close();
-      data_file.open( file_path, std::ios_base::binary | std::ios_base::in);
-      if(data_file.fail())
-        return false;
-      boost::archive::binary_iarchive a(data_file);
-      a >> obj;
-    }
-    return !data_file.fail();
-    CATCH_ENTRY_L0("unserialize_obj_from_file", false);
-  }
-}
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index d9c4193a9..b1903cf6c 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -48,7 +48,6 @@
 #include "file_io_utils.h"
 #include "int-util.h"
 #include "common/threadpool.h"
-#include "common/boost_serialization_helper.h"
 #include "warnings.h"
 #include "crypto/hash.h"
 #include "cryptonote_core.h"
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 2a514ceae..3346a9aba 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -40,7 +40,6 @@
 #include "blockchain.h"
 #include "blockchain_db/locked_txn.h"
 #include "blockchain_db/blockchain_db.h"
-#include "common/boost_serialization_helper.h"
 #include "int-util.h"
 #include "misc_language.h"
 #include "warnings.h"
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 1880d7ea0..9e99cac83 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -39,7 +39,9 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/archive/binary_iarchive.hpp>
 #include <boost/asio/ip/address.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/preprocessor/stringize.hpp>
 #include <openssl/evp.h>
@@ -64,7 +66,6 @@ using namespace epee;
 #include "multisig/multisig_account.h"
 #include "multisig/multisig_kex_msg.h"
 #include "multisig/multisig_tx_builder_ringct.h"
-#include "common/boost_serialization_helper.h"
 #include "common/command_line.h"
 #include "common/threadpool.h"
 #include "int-util.h"