Browse Source

appropriate response when trying to get a block in pruned mode

0.13
Jonas Schnelli 10 years ago
parent
commit
03c56872b5
  1. 3
      src/rest.cpp
  2. 3
      src/rpcblockchain.cpp

3
src/rest.cpp

@ -174,6 +174,9 @@ static bool rest_block(AcceptedConnection* conn, @@ -174,6 +174,9 @@ static bool rest_block(AcceptedConnection* conn,
throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found");
pblockindex = mapBlockIndex[hash];
if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0)
throw RESTERR(HTTP_NOT_FOUND, hashStr + " not available (pruned data)");
if (!ReadBlockFromDisk(block, pblockindex))
throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found");
}

3
src/rpcblockchain.cpp

@ -299,6 +299,9 @@ Value getblock(const Array& params, bool fHelp) @@ -299,6 +299,9 @@ Value getblock(const Array& params, bool fHelp)
CBlock block;
CBlockIndex* pblockindex = mapBlockIndex[hash];
if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0)
throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not available (pruned data)");
if(!ReadBlockFromDisk(block, pblockindex))
throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk");

Loading…
Cancel
Save