diff options
| author | John Newbery <john@johnnewbery.com> | 2019-10-24 11:35:42 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-10-29 15:46:45 -0400 |
| commit | a27a2957ed9afbe5a96caa5f0f4cbec730d27460 (patch) | |
| tree | e83a88e5984432ac8ac8b54b623f4c0ee88fc3b4 /src/blockencodings.cpp | |
| parent | 48cb468ce3f52195dfc64c6df88b8af36b77dbb0 (diff) | |
| download | bitcoin-a27a2957ed9afbe5a96caa5f0f4cbec730d27460.tar.xz | |
[validation] Add CValidationState subclasses
Split CValidationState into TxValidationState and BlockValidationState
to store validation results for transactions and blocks respectively.
Diffstat (limited to 'src/blockencodings.cpp')
| -rw-r--r-- | src/blockencodings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp index f0fcf675eb..bf13297582 100644 --- a/src/blockencodings.cpp +++ b/src/blockencodings.cpp @@ -197,13 +197,13 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector< if (vtx_missing.size() != tx_missing_offset) return READ_STATUS_INVALID; - CValidationState state; + BlockValidationState state; if (!CheckBlock(block, state, Params().GetConsensus())) { // TODO: We really want to just check merkle tree manually here, // but that is expensive, and CheckBlock caches a block's // "checked-status" (in the CBlock?). CBlock should be able to // check its own merkle root and cache that check. - if (state.GetReason() == ValidationInvalidReason::BLOCK_MUTATED) + if (state.GetResult() == BlockValidationResult::BLOCK_MUTATED) return READ_STATUS_FAILED; // Possible Short ID collision return READ_STATUS_CHECKBLOCK_FAILED; } |