As discussed in https://github.com/jtimon/bitcoin/commit/87cbdb8b41eee4067023cfa0d9d68722da74a5eb#commitcomment-14304228, the PR #6163 (commit https://github.com/jtimon/bitcoin/commit/87cbdb8b41eee4067023cfa0d9d68722da74a5eb ) contained one error: it changed AcceptBlockHeader's declaration without correspondingly changing its definition and it also added Consensus::Params as parameter instead of CChainParams. This fixes the mistake.
Globals: Make AcceptBlockHeader static (Fix #6163) (AcceptBlockHeader) #6982
pull jtimon wants to merge 1 commits into bitcoin:master from jtimon:fix-6163 changing 2 files +3 −5-
jtimon commented at 7:01 PM on November 10, 2015: contributor
- jtimon referenced this in commit 87cbdb8b41 on Nov 10, 2015
-
sdaftuar commented at 7:11 PM on November 10, 2015: member
utACK
-
MarcoFalke commented at 7:11 PM on November 10, 2015: member
utACK
-
petertodd commented at 8:54 PM on November 10, 2015: contributor
utACK
-
jtimon commented at 10:39 PM on November 10, 2015: contributor
@MarcoFalke Yes, it is not critical. In fact, just removing the unused declaration in main.h (unused because it's a different function from the one defined in .cpp, even if the name it's the same, that's why the mistake didn't break anything) would also solve it. Which makes me think...should I also make the function static (the change would be +3 -5 instead of +5 -5)?
-
7267843745
Globals: Make AcceptBlockHeader static (Fix #6163)
..and at the same time prevent AcceptBlockHeader() from calling global function Params()
- jtimon renamed this:
Fix #6163 (AcceptBlockHeader)
Globals: Make AcceptBlockHeader static (Fix #6163) (AcceptBlockHeader)
on Nov 11, 2015 -
laanwj commented at 12:44 AM on November 11, 2015: member
As the compiler doesn't catch this error, the declaration is clearly unnecessary and should be removed IMO
- jtimon force-pushed on Nov 11, 2015
-
jtimon commented at 12:52 AM on November 11, 2015: contributor
Made static and renamed PR and commit (more documentation in the commit itself).
-
laanwj commented at 1:04 AM on November 11, 2015: member
utACK
-
dcousens commented at 1:16 AM on November 11, 2015: contributor
utACK
-
paveljanik commented at 6:41 AM on November 11, 2015: contributor
ACK
-
MarcoFalke commented at 7:13 AM on November 11, 2015: member
ut(re)ACK
-
sipa commented at 7:25 AM on November 11, 2015: member
utACK
- laanwj merged this on Nov 11, 2015
- laanwj closed this on Nov 11, 2015
- laanwj referenced this in commit cb841e7513 on Nov 11, 2015
- zkbot referenced this in commit 6dcc7dd6ce on Mar 9, 2018
- zkbot referenced this in commit b094b02c0b on Mar 10, 2018
- zkbot referenced this in commit 59ef0e4c9c on Mar 12, 2018
- zkbot referenced this in commit 6dfd4baa1a on Mar 12, 2018
- zkbot referenced this in commit 05132fdca8 on Apr 6, 2018
- zkbot referenced this in commit 5fefc451a7 on Apr 13, 2018
- zkbot referenced this in commit 4c91fbf1c7 on May 31, 2018
- zkbot referenced this in commit 82d64f57c9 on Oct 24, 2018
- zkbot referenced this in commit 971f37e510 on Oct 25, 2018
- zkbot referenced this in commit 5b8b057c96 on Apr 5, 2019
- zkbot referenced this in commit a53fd12544 on Apr 9, 2019
- zkbot referenced this in commit fcf551eaaf on May 24, 2019
- zkbot referenced this in commit e25cb39033 on May 24, 2019
- zkbot referenced this in commit 3d37ebe9d8 on May 28, 2019
- DrahtBot locked this on Sep 8, 2021
