From 06aea2cf0a5a86a98fc33516f255373fb7c64c19 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 27 Jul 2017 15:46:47 +0100 Subject: [PATCH] move get_proof_of_trust_hash from util.h to p2p_protocol_defs.h This avoids having to include p2p_protocol_defs.h in util.h, as util.h is used a lot, and p2p_protocol_defs.h includes a lot of other things that most users don't need. --- src/common/util.h | 9 --------- src/p2p/net_node.inl | 2 +- src/p2p/p2p_protocol_defs.h | 8 ++++++++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/common/util.h b/src/common/util.h index 4291d7e18..2452bc9d5 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -40,7 +40,6 @@ #include #include "crypto/hash.h" -#include "p2p/p2p_protocol_defs.h" /*! \brief Various Tools * @@ -108,14 +107,6 @@ namespace tools bool sanitize_locale(); - inline crypto::hash get_proof_of_trust_hash(const nodetool::proof_of_trust& pot) - { - std::string s; - s.append(reinterpret_cast(&pot.peer_id), sizeof(pot.peer_id)); - s.append(reinterpret_cast(&pot.time), sizeof(pot.time)); - return crypto::cn_fast_hash(s.data(), s.size()); - } - /*! \brief Defines a signal handler for win32 and *nix */ class signal_handler diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index b23090c7d..19120c892 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -1382,7 +1382,7 @@ namespace nodetool } crypto::public_key pk = AUTO_VAL_INIT(pk); epee::string_tools::hex_to_pod(::config::P2P_REMOTE_DEBUG_TRUSTED_PUB_KEY, pk); - crypto::hash h = tools::get_proof_of_trust_hash(tr); + crypto::hash h = get_proof_of_trust_hash(tr); if(!crypto::check_signature(h, pk, tr.sign)) { LOG_ERROR("check_trust failed: sign check failed"); diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h index a471211a6..d8932a1df 100644 --- a/src/p2p/p2p_protocol_defs.h +++ b/src/p2p/p2p_protocol_defs.h @@ -440,6 +440,14 @@ namespace nodetool #endif + inline crypto::hash get_proof_of_trust_hash(const nodetool::proof_of_trust& pot) + { + std::string s; + s.append(reinterpret_cast(&pot.peer_id), sizeof(pot.peer_id)); + s.append(reinterpret_cast(&pot.time), sizeof(pot.time)); + return crypto::cn_fast_hash(s.data(), s.size()); + } + }