Use C++ initializer to initialze map and implement map comparator as const #10477

pull cg31 wants to merge 16 commits into bitcoin:master from cg31:master changing 2 files +22 −25

cg31 commented at 8:53 AM on May 30, 2017: none

The first change will avoid a cast. And the second makes code more compliant.
Use C++ initializer to initialze map to avoid casting. ec89c16b09
custom comparator for map should be declared as const. b28f8c0bcf
jonasschnelli commented at 9:31 AM on May 30, 2017: contributor

Trivial ACK b28f8c0bcfaaa81f83a1d53e0e63f6293ecc3d2f.
jonasschnelli added the label Refactoring on May 30, 2017
dcousens approved
dcousens commented at 9:32 AM on May 30, 2017: contributor

utACK
ryanofsky commented at 3:10 PM on May 30, 2017: member

utACK b28f8c0bcfaaa81f83a1d53e0e63f6293ecc3d2f

(This PR prompted me to spend the last half hour reading about how this list initialization actually works. I found https://stackoverflow.com/questions/24718555/what-language-rules-permit-c11-to-deduce-that-this-is-an-initializer-list-of-p, which I thought provided a very helpful q&a, in case anyone else was curious.)
Merge remote-tracking branch 'upstream/master' 336f4c034e
fanquake commented at 2:30 AM on May 31, 2017: member

utACK b28f8c0 Please squash the merge commit.
Broadcast address every day, not 9 hours 5ef86325d5
Use C++ initializer to initialze map to avoid casting. a8d4cc25e1
custom comparator for map should be declared as const. dd17431c36

[qa] Relax assumptions on mempool behavior during reorg

Policy limits (such as chain limits and mempool total size) could reasonably
be enforced more aggressively during a reorg, so use resendwallettransactions
to repopulate the mempool to avoid mined blocks being too small, and increase
the chain limits from the default for this test.

This is in preparation for a change in mempool behavior during a reorg.

e4ef631531

Store disconnected block transactions outside mempool during reorg

Rather than re-add disconnected block transactions back to the mempool
immediately, store them in a separate disconnectpool for later processing,
because we expect most such transactions to reappear in the chain that is
still to be connected (and thus we can avoid the work of reprocessing those
transactions through the mempool altogether).

05bc372e86

Add RecursiveDynamicUsage overload for std::shared_ptr
This simplifies a few usage expressions.
34061ad079
Introduce static DoWarning (simplify UpdateTip) 90f8fd9661
Merge branch 'master' of github.com:cg31/bitcoin 5ce654de35
Merge remote-tracking branch 'upstream/master' f6b2ac7fa2
Merge remote-tracking branch 'upstream/master' 0e6fa32ff5
fanquake commented at 1:45 PM on June 1, 2017: member

@cg31 Looks like you've introduced some unrelated commits.
Merge remote-tracking branch 'upstream/master' 99cd6459cd
Merge remote-tracking branch 'upstream/master' c48bb78867
sipa commented at 6:19 PM on June 3, 2017: member

@cg31 You'll need to rebase on master to get rid of the merge commits.
Merge remote-tracking branch 'upstream/master' 2cf7ea0bd9
MarcoFalke commented at 8:20 PM on June 5, 2017: member
@cg31 To get rid of the merge commit:
```
git checkout master
git reset --hard  b28f8c0
git push origin master -f
```
fanquake commented at 6:46 AM on June 8, 2017: member

@cg31 Thanks for the contribution here, but I'm going to close this in favour of #10545 which covers the whole codebase. If you'd like to review over there it would be appreciated.
fanquake closed this on Jun 8, 2017
DrahtBot locked this on Sep 8, 2021

Contributors

Labels