aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorEric Lombrozo <elombrozo@gmail.com>2013-06-23 19:14:11 -0700
committerEric Lombrozo <elombrozo@gmail.com>2013-06-23 19:59:35 -0700
commit38991ffa8ae627613fadaca8bbc14fcd820e0861 (patch)
tree39818cb34ec55f6ada29f26498ed8d6f31a44984 /src/main.h
parent1959997afb0c710f238ae33fc8c656ab9b5470c8 (diff)
downloadbitcoin-38991ffa8ae627613fadaca8bbc14fcd820e0861.tar.xz
Pulled CheckBlock out of CBlock.
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h
index e44844a79e..022c6ad074 100644
--- a/src/main.h
+++ b/src/main.h
@@ -703,9 +703,6 @@ public:
}
- // Context-independent validity checks
- bool CheckBlock(CValidationState &state, bool fCheckPOW=true, bool fCheckMerkleRoot=true) const;
-
// Store block on disk
// if dbp is provided, the file is known to already reside on disk
bool AcceptBlock(CValidationState &state, CDiskBlockPos *dbp = NULL);
@@ -732,6 +729,9 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
// Add this block to the block index, and if necessary, switch the active block chain to this
bool AddToBlockIndex(CBlock& block, CValidationState& state, const CDiskBlockPos& pos);
+// Context-independent validity checks
+bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
+
class CBlockFileInfo