Use storage to make sure forced retry is not done

network/rounds/manager.go

@@ -14,7 +14,6 @@ import (
 	"gitlab.com/elixxir/client/network/internal"
 	"gitlab.com/elixxir/client/network/message"
 	"gitlab.com/elixxir/client/stoppable"
-	"sync"
 )
 
 type Manager struct {
@@ -24,7 +23,6 @@ type Manager struct {
 
 	historicalRounds    chan historicalRoundRequest
 	lookupRoundMessages chan roundLookup
-	lookupRetryTracker  sync.Map
 	messageBundles      chan<- message.Bundle
 }
 

network/rounds/retrieve.go

@@ -83,16 +83,13 @@ func (m *Manager) processMessageRetrieval(comms messageRetrievalComms,
 			// randomly not picking up messages (FOR INTEGRATION TEST). Only done if
 			// round has not been ignored before
 			var bundle message.Bundle
-			_, ok := m.lookupRetryTracker.Load(ri.ID)
-			jww.INFO.Printf("After adding round %d to tracker entry is %v", ri.ID, ok)
-			if !ok && m.params.ForceMessagePickupRetry {
+			if m.params.ForceMessagePickupRetry {
 				bundle, err = m.forceMessagePickupRetry(ri, rl, comms, gwIds)
 				if err != nil {
 					jww.ERROR.Printf("Failed to get pickup round %d "+
 						"from all gateways (%v): %s",
 						id.Round(ri.ID), gwIds, err)
 				}
-				m.lookupRetryTracker.Store(ri.ID, struct{}{})
 			} else {
 				// Attempt to request for this gateway
 				bundle, err = m.getMessagesFromGateway(id.Round(ri.ID), rl.identity, comms, gwIds)
@@ -197,6 +194,8 @@ func (m *Manager) getMessagesFromGateway(roundID id.Round, identity reception.Id
 // not looking up messages
 func (m *Manager) forceMessagePickupRetry(ri *pb.RoundInfo, rl roundLookup,
 	comms messageRetrievalComms, gwIds []*id.ID) (bundle message.Bundle, err error) {
+	_, ok := m.Session.UncheckedRounds().GetRound(id.Round(ri.ID))
+	if !ok {
 		// Flip a coin to determine whether to pick up message
 		stream := m.Rng.GetStream()
 		defer stream.Close()
@@ -214,7 +213,7 @@ func (m *Manager) forceMessagePickupRetry(ri *pb.RoundInfo, rl roundLookup,
 			return
 		}
 
-
+	}
 	// Attempt to request for this gateway
 	return m.getMessagesFromGateway(id.Round(ri.ID), rl.identity, comms, gwIds)
 }