refactor: add a function for determining if a block is pruned or not

kallewoof · kallewoof · commit e9a1881b9070 · 2018-05-30T12:23:44.000+09:00
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -217,7 +217,7 @@ static bool rest_block(HTTPRequest* req,
             return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
         }
 
-        if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0)
+        if (IsBlockPruned(pblockindex))
             return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not available (pruned data)");
 
         if (!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus()))
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -742,7 +742,7 @@ static UniValue getblockheader(const JSONRPCRequest& request)
 static CBlock GetBlockChecked(const CBlockIndex* pblockindex)
 {
     CBlock block;
-    if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) {
+    if (IsBlockPruned(pblockindex)) {
         throw JSONRPCError(RPC_MISC_ERROR, "Block not available (pruned data)");
     }
 
diff --git a/src/validation.h b/src/validation.h
@@ -497,4 +497,10 @@ bool DumpMempool();
 /** Load the mempool from disk. */
 bool LoadMempool();
 
+//! Check whether the block associated with this index entry is pruned or not.
+inline bool IsBlockPruned(const CBlockIndex* pblockindex)
+{
+    return (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0);
+}
+
 #endif // BITCOIN_VALIDATION_H

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ static bool rest_block(HTTPRequest* req,`
`217`	`217`	`return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");`
`218`	`218`	`}`
`219`	`219`
`220`		`- if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0)`
	`220`	`+ if (IsBlockPruned(pblockindex))`
`221`	`221`	`return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not available (pruned data)");`
`222`	`222`
`223`	`223`	`if (!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus()))`
Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ static UniValue getblockheader(const JSONRPCRequest& request)`
`742`	`742`	`static CBlock GetBlockChecked(const CBlockIndex* pblockindex)`
`743`	`743`	`{`
`744`	`744`	`CBlock block;`
`745`		`- if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) {`
	`745`	`+ if (IsBlockPruned(pblockindex)) {`
`746`	`746`	`throw JSONRPCError(RPC_MISC_ERROR, "Block not available (pruned data)");`
`747`	`747`	`}`
`748`	`748`