Includes: Cleanup includes #5697

jtimon · 2015-01-23T13:03:05Z

Separated from #5681 (as explained there) to also include #5696 and to become a single commit cleanup (after those two and maybe other preparations have been merged).

jtimon · 2015-02-13T19:50:17Z

closing for now

jtimon · 2015-07-05T01:55:27Z

I know this will be more interesting after #6051 and #6335 but why keep waiting?
This is good already.

Diapolo · 2015-07-05T06:46:18Z

@jtimon But it fails Travis :-/.

jtimon · 2015-07-05T10:45:17Z

Fixed --disable-wallet build.

jtimon · 2015-07-05T12:39:15Z

Updated. Now also cleaning up net.h and wallet/ a little bit. Of course, adding the missing includes that are discovered.

jtimon · 2015-07-05T21:24:27Z

Sorry, updated again.

jtimon · 2015-07-06T23:24:01Z

Rebased

jgarzik · 2015-07-06T23:50:26Z

concept ACK - however this sort of PR needs constant rebasing. Usually better to break it up into even smaller chunks than modifying 40+ files in one go.

jtimon · 2015-07-07T07:43:48Z

Yes, that's why I try to avoid making these cleanups after the code moves that make them possible and not at the same time (so that the moves are less painful). But they keep accumulating...
The need for constant rebases and lack of review is why I closed it last time, and When I get bored of I will likely close it once again.
But, yes, smaller pieces (maybe small enough to get into the trivial branch while keeping the trivial branch itself maintainable) is a good suggestion, although I would really prefer that one day it just got merged once and for all (innocent me).

Diapolo · 2015-07-07T07:50:47Z

I always think this is a valuable work, but doesn't get much review time or seems to trivial for getting reviewed. Perhaps the trivial branch is the better place, but IMHO the trivial cycles should be shorter also.

jgarzik · 2015-07-23T18:55:05Z

ACK. Merge or close.

-Move from .h to .cpp: in main, net and wallet -Remove unnecessary #include "main.h" -Cleanup some wallet files includes

jtimon · 2015-07-23T19:13:06Z

Sorry, I didn't realized this needed a trivial rebase (a using namespace std near a newly added #include <boost/foreach.hpp> in walletmodel.cpp).

60c8bac Includes: Cleanup around net main and wallet (Jorge Timón) 9dd793f TRIVIAL: Missing includes (Jorge Timón)

laanwj · 2015-07-27T12:42:30Z

ACK - but let's do this only once per major release

jtimon · 2015-07-28T10:36:55Z

Limiting to at most one big include cleanup per major release sounds reasonable.
I'm not sure I will ever do another one as big as this one though (and smaller ones can be made part of the relevant PR or via the trivial branch).

* -maxuploadtarget can be set in MiB * if <limit> - ( time-left-in-24h-cycle / 600 * MAX_BLOCK_SIZE ) has reach, stop serve blocks older than one week and filtered blocks * no action if limit has reached, no guarantee that the target will not be surpassed * add outbound limit informations to rpc getnettotals Zcash: Also includes a cleanup from bitcoin/bitcoin#5697

Use SipHash for node eviction Backport of bitcoin/bitcoin#8173 Commits are listed in stack order. - pick bitcoin/bitcoin@eebc232187 - pick bitcoin/bitcoin@888483098e - pick bitcoin/bitcoin@c31b24f745 - pick bitcoin/bitcoin@9bf156bb9e - pick bitcoin/bitcoin@053930ffc4 - missing bitcoin/bitcoin#5697 (not a candidate for direct inclusion), using pieces directly - conflicts with #1258 which it removes part of (this is ok) - ignore bitcoin/bitcoin#6374 - requires bitcoin/bitcoin#7906, or at least bitcoin/bitcoin@cca221fd21 - pick bitcoin/bitcoin@cca221fd21 - conflicts with bitcoin/bitcoin#7181, not needed until later if at all

* -maxuploadtarget can be set in MiB * if <limit> - ( time-left-in-24h-cycle / 600 * MAX_BLOCK_SIZE ) has reach, stop serve blocks older than one week and filtered blocks * no action if limit has reached, no guarantee that the target will not be surpassed * add outbound limit informations to rpc getnettotals Zcash: Also includes a cleanup from bitcoin/bitcoin#5697

jtimon mentioned this pull request Jan 23, 2015

MOVEONLY-ish: Do not include main.h from any other header #5681

Merged

laanwj added UTXO Db and Indexes Refactoring and removed UTXO Db and Indexes labels Jan 26, 2015

jtimon force-pushed the main_includes2 branch 2 times, most recently from 2d5a18d to e962419 Compare February 3, 2015 23:05

jtimon mentioned this pull request Feb 4, 2015

Refactor: Create CCoinsViewEfficient interface for CCoinsViewCache #5747

Closed

jtimon force-pushed the main_includes2 branch from e962419 to d9b5dbd Compare February 6, 2015 22:03

jtimon changed the title ~~Cleanup: Don't include main.h from any other header~~ Cleanup includes after some code movements around (mostly from main) Feb 6, 2015

jtimon changed the title ~~Cleanup includes after some code movements around (mostly from main)~~ Cleanup includes after some code movements (mostly from main) Feb 6, 2015

jtimon mentioned this pull request Feb 8, 2015

WIP: Encapsulate consensus and policy code #5768

Closed

jtimon closed this Feb 13, 2015

jtimon reopened this Jul 5, 2015

jtimon changed the title ~~Cleanup includes after some code movements (mostly from main)~~ Includes: Move some from main.h to main.cpp and compile Jul 5, 2015

jtimon force-pushed the main_includes2 branch from d9b5dbd to 1e529c8 Compare July 5, 2015 01:54

jtimon force-pushed the main_includes2 branch from 1e529c8 to 47dd638 Compare July 5, 2015 10:44

jtimon force-pushed the main_includes2 branch from 47dd638 to 8b9ec02 Compare July 5, 2015 12:36

jtimon changed the title ~~Includes: Move some from main.h to main.cpp and compile~~ Includes: Cleanup includes Jul 5, 2015

jtimon force-pushed the main_includes2 branch 3 times, most recently from 1ad55f9 to a19bf34 Compare July 5, 2015 21:18

jtimon force-pushed the main_includes2 branch from a19bf34 to 0464e9c Compare July 6, 2015 23:23

jtimon mentioned this pull request Jul 11, 2015

TRIVIAL: Missing includes theuni/bitcoin#41

Closed

jtimon added 2 commits July 23, 2015 21:10

TRIVIAL: Missing includes

9dd793f

Includes: Cleanup around net main and wallet

60c8bac

-Move from .h to .cpp: in main, net and wallet -Remove unnecessary #include "main.h" -Cleanup some wallet files includes

jtimon force-pushed the main_includes2 branch from 0464e9c to 60c8bac Compare July 23, 2015 19:10

laanwj merged commit 60c8bac into bitcoin:master Jul 27, 2015

laanwj added a commit that referenced this pull request Jul 27, 2015

Merge pull request #5697

ca37e0f

60c8bac Includes: Cleanup around net main and wallet (Jorge Timón) 9dd793f TRIVIAL: Missing includes (Jorge Timón)

jtimon mentioned this pull request Apr 11, 2017

Include cleanup #10181

Merged

This was referenced Feb 11, 2021

Use SipHash for node eviction zcash/zcash#4980

Closed

Use SipHash for node eviction zcash/zcash#4985

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Includes: Cleanup includes #5697

Includes: Cleanup includes #5697

Uh oh!

Conversation

jtimon commented Jan 23, 2015

Uh oh!

jtimon commented Feb 13, 2015

Uh oh!

jtimon commented Jul 5, 2015

Uh oh!

Diapolo commented Jul 5, 2015

Uh oh!

jtimon commented Jul 5, 2015

Uh oh!

jtimon commented Jul 5, 2015

Uh oh!

jtimon commented Jul 5, 2015

Uh oh!

jtimon commented Jul 6, 2015

Uh oh!

jgarzik commented Jul 6, 2015

Uh oh!

jtimon commented Jul 7, 2015

Uh oh!

Diapolo commented Jul 7, 2015

Uh oh!

jgarzik commented Jul 23, 2015

Uh oh!

jtimon commented Jul 23, 2015

Uh oh!

laanwj commented Jul 27, 2015

Uh oh!

jtimon commented Jul 28, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants