diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-06 15:54:55 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-06 15:55:13 +0200 |
| commit | 2f7ae35ce8cf5d681de8e41a2f7c0f623fa71fc5 (patch) | |
| tree | 27cad2183e7195eafa3059d50161eaca960214b0 | |
| parent | 35d7d9471f9640f67820ec699b0e34a7ec5d7fb6 (diff) | |
| parent | fab52675144480c96c5564da4650205f1a41b08e (diff) | |
| download | bitcoin-2f7ae35ce8cf5d681de8e41a2f7c0f623fa71fc5.tar.xz | |
Merge #14149: doc: Remove misleading checkpoints comment in CMainParams
fab52675144480c96c5564da4650205f1a41b08e doxygen: Remove misleading checkpoints comment in CMainParams (MarcoFalke)
Pull request description:
This removes the checkpoints comment because it is misleading for two reasons:
* It shows up in the doxygen documentation of `CMainParams` https://dev.visucore.com/bitcoin/doxygen/class_c_main_params.html
* The comment refers to "strange transactions" in a block, which are not specified further. Transactions in blocks are always consensus-valid or rejected as consensus-invalid.
Also sort the includes with `clang-format`, as the file is touched anyway.
Tree-SHA512: b75f38dd0422b9310218307cbaa4dd5afa7579612d7dcdf781b8f25626f79c11e090dbcc83a05571f4418220c1a005f6254a9c461534d517ccecf7f1920be6be
| -rw-r--r-- | src/chainparams.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 93bb3e7647..b80cc2c259 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -4,16 +4,15 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <chainparams.h> -#include <consensus/merkle.h> +#include <chainparamsseeds.h> +#include <consensus/merkle.h> #include <tinyformat.h> #include <util.h> #include <utilstrencodings.h> #include <assert.h> -#include <chainparamsseeds.h> - static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward) { CMutableTransaction txNew; @@ -62,14 +61,6 @@ void CChainParams::UpdateVersionBitsParameters(Consensus::DeploymentPos d, int64 /** * Main network */ -/** - * What makes a good checkpoint block? - * + Is surrounded by blocks with reasonable timestamps - * (no blocks before with a timestamp after, none after with - * timestamp before) - * + Contains no strange transactions - */ - class CMainParams : public CChainParams { public: CMainParams() { |