aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-06-01 20:32:18 +0200
committerRiccardo Spagni <ric@spagni.net>2019-06-01 20:32:18 +0200
commit9a2883266c874230305b7f6450476d0885e6863e (patch)
tree1ecc4d9c825ddc7a0ffb87dc8a8646a66189367d
parentMerge pull request #5572 (diff)
parentcore: update pruning if using --prune-blockchain on a pruned blockchain (diff)
downloadmonero-9a2883266c874230305b7f6450476d0885e6863e.tar.xz
Merge pull request #5578
b7a96a08 core: update pruning if using --prune-blockchain on a pruned blockchain (moneromooo-monero)
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index be1ea5a17..55e1b287f 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -675,8 +675,14 @@ namespace cryptonote
{
// display a message if the blockchain is not pruned yet
if (m_blockchain_storage.get_current_blockchain_height() > 1 && !m_blockchain_storage.get_blockchain_pruning_seed())
+ {
MGINFO("Pruning blockchain...");
- CHECK_AND_ASSERT_MES(m_blockchain_storage.prune_blockchain(), false, "Failed to prune blockchain");
+ CHECK_AND_ASSERT_MES(m_blockchain_storage.prune_blockchain(), false, "Failed to prune blockchain");
+ }
+ else
+ {
+ CHECK_AND_ASSERT_MES(m_blockchain_storage.update_blockchain_pruning(), false, "Failed to update blockchain pruning");
+ }
}
return load_state_data();