diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:58:46 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:58:46 +0200 |
commit | b806d9844e4cfdb94e7a2d175efdf41d5ad480ff (patch) | |
tree | f90f634f25079749febf00618ac3160d204f2d7a /src/checkpoints/checkpoints.h | |
parent | Merge pull request #2881 (diff) | |
parent | move includes around to lessen overall load (diff) | |
download | monero-b806d9844e4cfdb94e7a2d175efdf41d5ad480ff.tar.xz |
Merge pull request #2864
09ce03d6 move includes around to lessen overall load (moneromooo-monero)
Diffstat (limited to '')
-rw-r--r-- | src/checkpoints/checkpoints.h | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/checkpoints/checkpoints.h b/src/checkpoints/checkpoints.h index a643c5790..3e034f6f0 100644 --- a/src/checkpoints/checkpoints.h +++ b/src/checkpoints/checkpoints.h @@ -33,7 +33,6 @@ #include <vector> #include "misc_log_ex.h" #include "crypto/hash.h" -#include "serialization/keyvalue_serialization.h" #define ADD_CHECKPOINT(h, hash) CHECK_AND_ASSERT(add_checkpoint(h, hash), false); #define JSON_HASH_FILE_NAME "checkpoints.json" @@ -187,32 +186,7 @@ namespace cryptonote bool load_checkpoints_from_dns(bool testnet = false); private: - - - /** - * @brief struct for loading a checkpoint from json - */ - struct t_hashline - { - uint64_t height; //!< the height of the checkpoint - std::string hash; //!< the hash for the checkpoint - BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE(height) - KV_SERIALIZE(hash) - END_KV_SERIALIZE_MAP() - }; - - /** - * @brief struct for loading many checkpoints from json - */ - struct t_hash_json { - std::vector<t_hashline> hashlines; //!< the checkpoint lines from the file - BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE(hashlines) - END_KV_SERIALIZE_MAP() - }; - std::map<uint64_t, crypto::hash> m_points; //!< the checkpoints container - }; + } |