diff options
author | MacroFake <falke.marco@gmail.com> | 2022-05-12 08:57:12 +0200 |
---|---|---|
committer | MacroFake <falke.marco@gmail.com> | 2022-05-12 08:57:22 +0200 |
commit | a2a8e919ee07506083f45426874cd2edf82d9f9f (patch) | |
tree | fb1f82ca4b8660b3366bf80c16d0321ec4f4f07c /src/init.cpp | |
parent | 51527ec1ec4264f7e24ef548bb049db07a89fc7f (diff) | |
parent | ab1ea29ba1b8379a21fabd3dc859552c470a6421 (diff) | |
download | bitcoin-a2a8e919ee07506083f45426874cd2edf82d9f9f.tar.xz |
Merge bitcoin/bitcoin#24925: refactor: make GetRand a template, remove GetRandInt
ab1ea29ba1b8379a21fabd3dc859552c470a6421 refactor: make GetRand a template, remove GetRandInt (pasta)
Pull request description:
makes GetRand a template for which any integral type can be used, where the default behavior is to return a random integral up to the max of the integral unless a max is provided.
This simplifies a lot of code from GetRand(std::numeric_limits<uint64_t>::max() -> GetRand<uint64_t>()
ACKs for top commit:
laanwj:
Code review ACK ab1ea29ba1b8379a21fabd3dc859552c470a6421
Tree-SHA512: db5082a0e21783389f1be898ae73e097b31ab48cab1a2c0e29348a4adeb545d4098193aa72a547c6baa6e8205699aafec38d6a27b3d65522fb3246f91b4daae9
Diffstat (limited to 'src/init.cpp')
-rw-r--r-- | src/init.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 713598f411..feb4ad52a6 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1280,8 +1280,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) assert(!node.banman); node.banman = std::make_unique<BanMan>(gArgs.GetDataDirNet() / "banlist", &uiInterface, args.GetIntArg("-bantime", DEFAULT_MISBEHAVING_BANTIME)); assert(!node.connman); - node.connman = std::make_unique<CConnman>(GetRand(std::numeric_limits<uint64_t>::max()), - GetRand(std::numeric_limits<uint64_t>::max()), + node.connman = std::make_unique<CConnman>(GetRand<uint64_t>(), + GetRand<uint64_t>(), *node.addrman, *node.netgroupman, args.GetBoolArg("-networkactive", true)); assert(!node.fee_estimator); |