Fix RPC/pruneblockchain returned prune height

Github-Pull: bitcoin#15991 Rebased-From: 97f517d
maflcko · Jun 14, 2019 · c80a498 · c80a498
1 parent b239824
commit c80a498
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1030,7 +1030,12 @@ static UniValue pruneblockchain(const JSONRPCRequest& request)
     }
 
     PruneBlockFilesManual(height);
-    return uint64_t(height);
+    const CBlockIndex* block = ::chainActive.Tip();
+    assert(block);
+    while (block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA)) {
+        block = block->pprev;
+    }
+    return uint64_t(block->nHeight);
 }
 
 static UniValue gettxoutsetinfo(const JSONRPCRequest& request)