gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-17 15:22:48 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2215

Browse Source 
06aea2cf move get_proof_of_trust_hash from util.h to p2p_protocol_defs.h (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2017-08-07 15:10:42 +02:00
parent a963da9001 06aea2cf0a
commit a6ea26e7fa
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/util.h
View File

@@ -40,7 +40,6 @@
#include <string>
#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<const char*>(&pot.peer_id), sizeof(pot.peer_id));
s.append(reinterpret_cast<const char*>(&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