diff options
| author | Eric Lombrozo <elombrozo@gmail.com> | 2013-06-23 18:32:58 -0700 |
|---|---|---|
| committer | Eric Lombrozo <elombrozo@gmail.com> | 2013-06-23 19:59:34 -0700 |
| commit | 5c363ed622ef8e060a3e6f6918a8b5e05798f21e (patch) | |
| tree | a23fd8b6e87ca9018c309dda760bf656f112eabc /src/main.h | |
| parent | 8031399494cc4cdf47fcaa9763282a930444033f (diff) | |
| download | bitcoin-5c363ed622ef8e060a3e6f6918a8b5e05798f21e.tar.xz | |
Pulled DisconnectBlock out of CBlock.
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/main.h b/src/main.h index 47a9fb3381..1822becde5 100644 --- a/src/main.h +++ b/src/main.h @@ -703,12 +703,6 @@ public: } - /** Undo the effects of this block (with given index) on the UTXO set represented by coins. - * In case pfClean is provided, operation will try to be tolerant about errors, and *pfClean - * will be true if no problems were found. Otherwise, the return value will be false in case - * of problems. Note that in any case, coins may be modified. */ - bool DisconnectBlock(CValidationState &state, CBlockIndex *pindex, CCoinsViewCache &coins, bool *pfClean = NULL); - // Apply the effects of this block (with given index) on the UTXO set represented by coins bool ConnectBlock(CValidationState &state, CBlockIndex *pindex, CCoinsViewCache &coins, bool fJustCheck=false); @@ -730,6 +724,16 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos); bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex); +/** Functions for validating blocks and updating the block tree */ + +/** Undo the effects of this block (with given index) on the UTXO set represented by coins. + * In case pfClean is provided, operation will try to be tolerant about errors, and *pfClean + * will be true if no problems were found. Otherwise, the return value will be false in case + * of problems. Note that in any case, coins may be modified. */ +bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& coins, bool* pfClean = NULL); + + + class CBlockFileInfo { public: |