Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Sep 4, 2018

This removes the checkpoints comment because it is misleading for two reasons:

Also sort the includes with clang-format, as the file is touched anyway.

@DrahtBot
Copy link
Contributor

DrahtBot commented Sep 4, 2018

Note to reviewers: This pull request conflicts with the following ones:

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Copy link
Contributor

@pstratem pstratem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK checkpoints no longer consider timestamps and the strange transactions comment was always nonsensical

@maflcko maflcko added the Docs label Sep 4, 2018
@promag
Copy link
Contributor

promag commented Sep 4, 2018

utACK fab5267.

@fanquake
Copy link
Member

fanquake commented Sep 4, 2018

utACK fab5267

@laanwj
Copy link
Member

laanwj commented Sep 6, 2018

utACK fab5267

@laanwj laanwj merged commit fab5267 into bitcoin:master Sep 6, 2018
laanwj added a commit that referenced this pull request Sep 6, 2018
fab5267 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
@maflcko maflcko deleted the Mf1809-docCheckpointsCMainParams branch September 6, 2018 14:18
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jul 3, 2021
…ainParams

fab5267 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

# Conflicts:
#	src/chainparams.cpp
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jul 7, 2021
…ainParams

fab5267 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

# Conflicts:
#	src/chainparams.cpp
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants