fix: revert nextAttemptTime back to mockable time, set next_deadline based on signedSessions emptiness

UdjinM6 · UdjinM6 · commit 25e53e5af522 · 2025-10-18T15:46:41.000+03:00
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
@@ -1029,7 +1029,7 @@ void CSigSharesManager::CollectSigSharesToSendConcentrated(std::unordered_map<No
         proTxToNode.try_emplace(verifiedProRegTxHash, pnode);
     }
 
-    auto curTime = std::chrono::steady_clock::now();
+    auto curTime = NodeClock::now();
 
     for (auto& [_, signedSession] : signedSessions) {
         if (!IsAllMembersConnectedEnabled(signedSession.quorum->params.type, m_sporkman)) {
@@ -1527,14 +1527,9 @@ void CSigSharesManager::WorkThreadMain(CConnman& connman, PeerManager& peerman)
             }
         }
         {
-            // Consider next recovery attempt times for signed sessions to avoid polling
             LOCK(cs);
-            auto now_steady = std::chrono::steady_clock::now();
-            for (const auto& [_, s] : signedSessions) {
-                if (s.nextAttemptTime > now_steady) {
-                    if (s.nextAttemptTime < next_deadline) next_deadline = s.nextAttemptTime;
-                }
-            }
+            next_deadline = std::chrono::steady_clock::now() +
+                            (signedSessions.empty() ? std::chrono::seconds(5) : std::chrono::milliseconds(100));
         }
 
         // Wait event-driven until notified or deadline reached, or interrupted
@@ -1577,7 +1572,7 @@ void CSigSharesManager::SignPendingSigShares(const CConnman& connman, PeerManage
                 auto& session = signedSessions[sigShare.GetSignHash()];
                 session.sigShare = sigShare;
                 session.quorum = pQuorum;
-                session.nextAttemptTime = std::chrono::steady_clock::time_point{};
+                session.nextAttemptTime = NodeClock::time_point{};
                 session.attempt = 0;
             }
         }
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
@@ -355,7 +355,7 @@ class CSignedSession
     CSigShare sigShare;
     CQuorumCPtr quorum;
 
-    std::chrono::steady_clock::time_point nextAttemptTime{};
+    NodeClock::time_point nextAttemptTime{};
     int attempt{0};
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1029,7 +1029,7 @@ void CSigSharesManager::CollectSigSharesToSendConcentrated(std::unordered_map<No`
`1029`	`1029`	`proTxToNode.try_emplace(verifiedProRegTxHash, pnode);`
`1030`	`1030`	`}`
`1031`	`1031`
`1032`		`- auto curTime = std::chrono::steady_clock::now();`
	`1032`	`+ auto curTime = NodeClock::now();`
`1033`	`1033`
`1034`	`1034`	`for (auto& [_, signedSession] : signedSessions) {`
`1035`	`1035`	`if (!IsAllMembersConnectedEnabled(signedSession.quorum->params.type, m_sporkman)) {`
`@@ -1527,14 +1527,9 @@ void CSigSharesManager::WorkThreadMain(CConnman& connman, PeerManager& peerman)`
`1527`	`1527`	`}`
`1528`	`1528`	`}`
`1529`	`1529`	`{`
`1530`		`- // Consider next recovery attempt times for signed sessions to avoid polling`
`1531`	`1530`	`LOCK(cs);`
`1532`		`- auto now_steady = std::chrono::steady_clock::now();`
`1533`		`- for (const auto& [_, s] : signedSessions) {`
`1534`		`- if (s.nextAttemptTime > now_steady) {`
`1535`		`- if (s.nextAttemptTime < next_deadline) next_deadline = s.nextAttemptTime;`
`1536`		`- }`
`1537`		`- }`
	`1531`	`+ next_deadline = std::chrono::steady_clock::now() +`
	`1532`	`+ (signedSessions.empty() ? std::chrono::seconds(5) : std::chrono::milliseconds(100));`
`1538`	`1533`	`}`
`1539`	`1534`
`1540`	`1535`	`// Wait event-driven until notified or deadline reached, or interrupted`
`@@ -1577,7 +1572,7 @@ void CSigSharesManager::SignPendingSigShares(const CConnman& connman, PeerManage`
`1577`	`1572`	`auto& session = signedSessions[sigShare.GetSignHash()];`
`1578`	`1573`	`session.sigShare = sigShare;`
`1579`	`1574`	`session.quorum = pQuorum;`
`1580`		`- session.nextAttemptTime = std::chrono::steady_clock::time_point{};`
	`1575`	`+ session.nextAttemptTime = NodeClock::time_point{};`
`1581`	`1576`	`session.attempt = 0;`
`1582`	`1577`	`}`
`1583`	`1578`	`}`