This pull request is the completion of #2154.
The original intention was to also move CBlock into core.h but was postponed in the interest of merging what had already been done.
Finish moving core data structures into core.h. #2758
pull CodeShark wants to merge 10 commits into bitcoin:master from CodeShark:CBlock-to-core changing 7 files +275 −273-
CodeShark commented at 12:50 AM on June 11, 2013: contributor
-
jgarzik commented at 1:41 PM on June 11, 2013: contributor
Code appears correct to me. Conditional ACK -- ACK iff other devs agree that pulling this code out of CBlock is the right thing to do.
-
sipa commented at 2:41 PM on June 11, 2013: member
Yes, I agree this code should be pulled out of CBlock. Reason: having a definition of a Bitcoin block available without needing to depend on all storage/validation logic (which on itself pulls in pretty much the whole project as dependencies).
Agree with the less generic names. Longer term, this should be dealt with using namespace, but that's not something to do incrementally, IMHO.
EDIT: Note, I haven't actually checked the code of this pullreq.
-
BitcoinPullTester commented at 1:01 AM on June 13, 2013: none
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/a4a5e834754cf2b996a857459e1bd8e118bba4db for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
-
-
Moved CBlock::WriteToDisk out of CBlock to inline function WriteBlockToDisk in main.h a6dba0fdb2
-
Moved WriteBlockToDisk implementation from main.h to main.cpp 226f821942
-
Moved CBlock::ReadFromDisk out of CBlock to functions ReadBlockFromDisk in main.h 7db120d531
-
Moved ReadBlockFromDisk implementation to main.cpp 8031399494
-
Pulled DisconnectBlock out of CBlock. 5c363ed622
-
Pulled ConnectBlock out of CBlock. f3ae51dcce
-
Pulled AddToBlockIndex out of CBlock. 1959997afb
-
Pulled CheckBlock out of CBlock. 38991ffa8a
-
Pulled AcceptBlock out of CBlock. 2a4d3464fd
-
Moved CBlock from main.h to core.h 33944573ca
-
CodeShark commented at 3:03 AM on June 24, 2013: contributor
Rebased
-
jgarzik commented at 3:23 AM on June 24, 2013: contributor
ACK code changes; didn't build or test.
-
sipa commented at 9:44 AM on June 24, 2013: member
ACK. Agree with code changes, individual commits look good, build works, tried unit tests, tried resync on testnet.
-
sipa commented at 9:56 AM on June 24, 2013: member
Dependency improvements possible now:
- bloom.cpp: main.h -> core.h
- chainparams.cpp: main.h -> core.h, protocol.h
- jgarzik referenced this in commit 64225f7ce9 on Jun 24, 2013
- jgarzik merged this on Jun 24, 2013
- jgarzik closed this on Jun 24, 2013
-
jgarzik commented at 2:42 PM on June 24, 2013: contributor
Updated deps directly with push to master.
- Bushstar referenced this in commit 3a5e7c4334 on Apr 5, 2019
- DrahtBot locked this on Sep 8, 2021
Contributors