select on cancellation and send delay

decred · Dec 31, 2024 · 20997c8 · 20997c8
1 parent 0b923ed
commit 20997c8
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/mixing/mixclient/client.go b/mixing/mixclient/client.go
@@ -567,17 +567,11 @@ func (c *Client) sendLocalPeerMsgs(ctx context.Context, deadline time.Time, s *s
 
 	for i := range msgs {
 		m := msgs[i]
-		if sessionCancelled() {
-			continue
-		}
-		if err := m.p.ctx.Err(); err != nil {
-			nilPeerMsg(m.p, m.m)
-			errs = append(errs, err)
-			continue
-		}
-		time.Sleep(time.Until(m.sendTime))
-		if sessionCancelled() {
+		select {
+		case <-ctx.Done():
+			sessionCancelled()
 			continue
+		case <-time.After(time.Until(m.sendTime)):
 		}
 		// TODO: handle send deadline in wallet.SubmitMixMessage.
 		if time.Now().After(m.deadline) {