Fix RPC/pruneblockchain returned prune height

jonasschnelli · MarcoFalke · commit c80a498ae532 · 2019-06-14T16:01:37.000-04:00
Github-Pull: #15991 Rebased-From: 97f517d
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)

Original file line number	Diff line number	Diff line change
`@@ -1030,7 +1030,12 @@ static UniValue pruneblockchain(const JSONRPCRequest& request)`
`1030`	`1030`	`}`
`1031`	`1031`
`1032`	`1032`	`PruneBlockFilesManual(height);`
`1033`		`- return uint64_t(height);`
	`1033`	`+ const CBlockIndex* block = ::chainActive.Tip();`
	`1034`	`+ assert(block);`
	`1035`	`+ while (block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA)) {`
	`1036`	`+ block = block->pprev;`
	`1037`	`+ }`
	`1038`	`+ return uint64_t(block->nHeight);`
`1034`	`1039`	`}`
`1035`	`1040`
`1036`	`1041`	`static UniValue gettxoutsetinfo(const JSONRPCRequest& request)`