mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 5c0cd205a1 into merged_master (Bitcoin PR bitcoin/bitcoin#29625)
This commit is contained in:
parent
e35c518374
commit
8d69f4b94d
44 changed files with 742 additions and 567 deletions
|
|
@ -113,8 +113,8 @@ class PriorityComputer {
|
|||
const uint64_t m_k0, m_k1;
|
||||
public:
|
||||
explicit PriorityComputer(bool deterministic) :
|
||||
m_k0{deterministic ? 0 : GetRand(0xFFFFFFFFFFFFFFFF)},
|
||||
m_k1{deterministic ? 0 : GetRand(0xFFFFFFFFFFFFFFFF)} {}
|
||||
m_k0{deterministic ? 0 : FastRandomContext().rand64()},
|
||||
m_k1{deterministic ? 0 : FastRandomContext().rand64()} {}
|
||||
|
||||
Priority operator()(const uint256& txhash, NodeId peer, bool preferred) const
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue