aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Ryan <jeffro256@tutanota.com>2022-12-22 12:18:02 -0600
committerJeffrey Ryan <jeffro256@tutanota.com>2022-12-22 12:18:02 -0600
commit7a3a593a776840bb78a2566dc64058b83e97eacd (patch)
treedd8a5b8b47d145e673494cfb34a9ff1dff858aa3
parentMerge pull request #8593 (diff)
downloadmonero-7a3a593a776840bb78a2566dc64058b83e97eacd.tar.xz
common: move boost_serialization_helper.h out and cleanup includes
-rw-r--r--src/cryptonote_core/blockchain.cpp1
-rw-r--r--src/cryptonote_core/tx_pool.cpp1
-rw-r--r--src/wallet/wallet2.cpp3
-rw-r--r--tests/core_tests/chaingen.h2
-rw-r--r--tests/core_tests/chaingen_serialization.h (renamed from src/common/boost_serialization_helper.h)0
5 files changed, 3 insertions, 4 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 135dd3df0..3b7234a05 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 a1a51f7de..53a01914d 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"
diff --git a/tests/core_tests/chaingen.h b/tests/core_tests/chaingen.h
index d5c9edc55..1f782831f 100644
--- a/tests/core_tests/chaingen.h
+++ b/tests/core_tests/chaingen.h
@@ -44,7 +44,7 @@
#include <boost/functional/hash.hpp>
#include "include_base_utils.h"
-#include "common/boost_serialization_helper.h"
+#include "chaingen_serialization.h"
#include "common/command_line.h"
#include "common/threadpool.h"
diff --git a/src/common/boost_serialization_helper.h b/tests/core_tests/chaingen_serialization.h
index 4a903107f..4a903107f 100644
--- a/src/common/boost_serialization_helper.h
+++ b/tests/core_tests/chaingen_serialization.h