fixed so that known rounds are unique per user identity

network/follow.go

@@ -229,12 +229,9 @@ func (m *manager) follow(rng csprng.Source, comms followNetworkComms) {
 		return m.round.Checker(rid, filterList, identity)
 	}
 
-	// get the bit vector of rounds that have been checked
-	checkedRounds := m.Session.GetCheckedRounds()
-
 	// loop through all rounds the client does not know about and the gateway
 	// does, checking the bloom filter for the user to see if there are
 	// messages for the user (bloom not implemented yet)
-	checkedRounds.RangeUncheckedMaskedRange(gwRoundsState, roundChecker,
+	identity.KR.RangeUncheckedMaskedRange(gwRoundsState, roundChecker,
 		firstRound, lastRound+1, int(m.param.MaxCheckedRounds))
 }

network/rounds/retrieve.go

@@ -17,7 +17,6 @@ import (
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/primitives/id"
-	"gitlab.com/xx_network/primitives/id/ephemeral"
 )
 
 type messageRetrievalComms interface {
@@ -41,7 +40,7 @@ func (m *Manager) processMessageRetrieval(comms messageRetrievalComms,
 			done = true
 		case rl := <-m.lookupRoundMessages:
 			ri := rl.roundInfo
-			bundle, err := m.getMessagesFromGateway(ri, comms, rl.identity.EphId)
+			bundle, err := m.getMessagesFromGateway(ri, comms, rl.identity)
 			if err != nil {
 				jww.WARN.Printf("Failed to get messages for round %v: %s",
 					ri.ID, err)
@@ -57,7 +56,7 @@ func (m *Manager) processMessageRetrieval(comms messageRetrievalComms,
 }
 
 func (m *Manager) getMessagesFromGateway(roundInfo *pb.RoundInfo,
-	comms messageRetrievalComms, ephid ephemeral.Id) (message.Bundle, error) {
+	comms messageRetrievalComms, identity reception.IdentityUse) (message.Bundle, error) {
 
 	rid := id.Round(roundInfo.ID)
 
@@ -69,11 +68,11 @@ func (m *Manager) getMessagesFromGateway(roundInfo *pb.RoundInfo,
 	}
 
 	jww.INFO.Printf("Getting messages for RoundID %v for EphID %d " +
-		"via Gateway: %s", rid, ephid, gwHost.GetId())
+		"via Gateway: %s", rid, identity.EphId, gwHost.GetId())
 
 	// send the request
 	msgReq := &pb.GetMessages{
-		ClientID: ephid[:],
+		ClientID: identity.EphId[:],
 		RoundID:  uint64(rid),
 	}
 	msgResp, err := comms.RequestMessages(gwHost, msgReq)
@@ -87,7 +86,7 @@ func (m *Manager) getMessagesFromGateway(roundInfo *pb.RoundInfo,
 	if !msgResp.GetHasRound() {
 		rid := id.Round(roundInfo.ID)
 		m.p.Done(rid)
-		m.Session.GetCheckedRounds().Check(rid)
+		identity.KR.Check(rid)
 		return message.Bundle{}, errors.Errorf("host %s does not have "+
 			"roundID: %d", gwHost.String(), rid)
 	}
@@ -111,7 +110,7 @@ func (m *Manager) getMessagesFromGateway(roundInfo *pb.RoundInfo,
 		Round:    rid,
 		Messages: make([]format.Message, len(msgs)),
 		Finish: func() {
-			m.Session.GetCheckedRounds().Check(rid)
+			identity.KR.Check(rid)
 			m.p.Done(rid)
 		},
 	}

storage/session.go

@@ -25,7 +25,6 @@ import (
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/elixxir/ekv"
-	"gitlab.com/elixxir/primitives/knownRounds"
 	"gitlab.com/xx_network/crypto/csprng"
 	"gitlab.com/xx_network/crypto/large"
 	"gitlab.com/xx_network/crypto/signature/rsa"
@@ -57,7 +56,6 @@ type Session struct {
 	criticalMessages    *utility.E2eMessageBuffer
 	criticalRawMessages *utility.CmixMessageBuffer
 	garbledMessages     *utility.MeteredCmixMessageBuffer
-	checkedRounds       *utility.KnownRounds
 	reception           *reception.Store
 }
 
@@ -129,11 +127,6 @@ func New(baseDir, password string, u userInterface.User, cmixGrp,
 		return nil, errors.WithMessage(err, "Failed to create raw critical message buffer")
 	}
 
-	s.checkedRounds, err = utility.NewKnownRounds(s.kv, checkedRoundsKey, knownRounds.NewKnownRound(CheckRoundsMaxSize))
-	if err != nil {
-		return nil, errors.WithMessage(err, "Failed to create checked rounds buffer")
-	}
-
 	s.conversations = conversation.NewStore(s.kv)
 	s.partition = partition.New(s.kv)
 
@@ -192,11 +185,6 @@ func Load(baseDir, password string, rng *fastRNG.StreamGenerator) (*Session, err
 		return nil, errors.WithMessage(err, "Failed to load session")
 	}
 
-	s.checkedRounds, err = utility.LoadKnownRounds(s.kv, checkedRoundsKey, CheckRoundsMaxSize)
-	if err != nil {
-		return nil, errors.WithMessage(err, "Failed to load session")
-	}
-
 	s.conversations = conversation.NewStore(s.kv)
 	s.partition = partition.New(s.kv)
 
@@ -253,12 +241,6 @@ func (s *Session) GetGarbledMessages() *utility.MeteredCmixMessageBuffer {
 	return s.garbledMessages
 }
 
-func (s *Session) GetCheckedRounds() *utility.KnownRounds {
-	s.mux.RLock()
-	defer s.mux.RUnlock()
-	return s.checkedRounds
-}
-
 func (s *Session) Conversations() *conversation.Store {
 	s.mux.RLock()
 	defer s.mux.RUnlock()