When mixing, always try to join an exsisting queue, only fall back to starting a new queue (#3085)

PastaPastaPasta · UdjinM6 · commit ac90abe892e0 · 2019-09-17T15:07:56.000+03:00
Signed-off-by: Pasta &lt;pasta@dashboost.org&gt;
diff --git a/src/privatesend/privatesend-client.cpp b/src/privatesend/privatesend-client.cpp
@@ -927,12 +927,12 @@ bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool
         }
     } // LOCK2(cs_main, vpwallets[0]->cs_wallet);
 
-    bool fUseQueue = GetRandInt(100) > 33;
-    // don't use the queues all of the time for mixing
-    if (fUseQueue && JoinExistingQueue(nBalanceNeedsAnonymized, connman)) {
+    // Always attempt to join an existing queue
+    if (JoinExistingQueue(nBalanceNeedsAnonymized, connman)) {
         return true;
     }
 
+    // If we were unable to find/join an existing queue then start a new one.
     if (StartNewQueue(nBalanceNeedsAnonymized, connman)) return true;
 
     strAutoDenomResult = _("No compatible Masternode found.");

Original file line number	Diff line number	Diff line change
`@@ -927,12 +927,12 @@ bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool`
`927`	`927`	`}`
`928`	`928`	`} // LOCK2(cs_main, vpwallets[0]->cs_wallet);`
`929`	`929`
`930`		`- bool fUseQueue = GetRandInt(100) > 33;`
`931`		`- // don't use the queues all of the time for mixing`
`932`		`- if (fUseQueue && JoinExistingQueue(nBalanceNeedsAnonymized, connman)) {`
	`930`	`+ // Always attempt to join an existing queue`
	`931`	`+ if (JoinExistingQueue(nBalanceNeedsAnonymized, connman)) {`
`933`	`932`	`return true;`
`934`	`933`	`}`
`935`	`934`
	`935`	`+ // If we were unable to find/join an existing queue then start a new one.`
`936`	`936`	`if (StartNewQueue(nBalanceNeedsAnonymized, connman)) return true;`
`937`	`937`
`938`	`938`	`strAutoDenomResult = _("No compatible Masternode found.");`