diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-08-01 01:39:19 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-08-01 01:53:29 +0200 |
| commit | 8ea7d31e384975019733b5778feabbd9955c79d8 (patch) | |
| tree | a849ed5b58bc86bd4c808c09997f1ea0f2777546 /src/main.h | |
| parent | f798b891bcecea9548eedacae70eeb9906c1ddbf (diff) | |
| parent | c8664eeac75fb87282dc69049cfa23d583742629 (diff) | |
| download | bitcoin-8ea7d31e384975019733b5778feabbd9955c79d8.tar.xz | |
Merge #8413: Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock
c8664ee Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock (Jorge Timón)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 7f337b80ba..d4d70c0180 100644 --- a/src/main.h +++ b/src/main.h @@ -459,7 +459,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P * By "context", we mean only the previous block headers, but not the UTXO * set; UTXO-related validity checks are done in ConnectBlock(). */ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime); -bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CBlockIndex* pindexPrev); +bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev); /** Apply the effects of this block (with given index) on the UTXO set represented by coins. * Validity checks that depend on the UTXO set are also done; ConnectBlock() |