Merge pull request #5452

c30d93fc rpc: add a pruned bool to the prune_blockchain call (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-16 22:48:50 +02:00
commit 1b092f3a44
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 1 deletions

View File

@ -2382,6 +2382,7 @@ namespace cryptonote
return false; return false;
} }
res.pruning_seed = m_core.get_blockchain_pruning_seed(); res.pruning_seed = m_core.get_blockchain_pruning_seed();
res.pruned = res.pruning_seed != 0;
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {

View File

@ -84,7 +84,7 @@ namespace cryptonote
// advance which version they will stop working with // advance which version they will stop working with
// Don't go over 32767 for any of these // Don't go over 32767 for any of these
#define CORE_RPC_VERSION_MAJOR 2 #define CORE_RPC_VERSION_MAJOR 2
#define CORE_RPC_VERSION_MINOR 5 #define CORE_RPC_VERSION_MINOR 6
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor)) #define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR) #define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
@ -2320,11 +2320,13 @@ namespace cryptonote
struct response_t struct response_t
{ {
bool pruned;
uint32_t pruning_seed; uint32_t pruning_seed;
std::string status; std::string status;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(status) KV_SERIALIZE(status)
KV_SERIALIZE(pruned)
KV_SERIALIZE(pruning_seed) KV_SERIALIZE(pruning_seed)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };