diff --git a/network/ephemeral/tracker.go b/network/ephemeral/tracker.go index b3265afe1a14738d9abd1247dd7932024a0debc3..5c2a23b4f750b372bd237895c7d7b664707ccd2e 100644 --- a/network/ephemeral/tracker.go +++ b/network/ephemeral/tracker.go @@ -10,6 +10,7 @@ package ephemeral import ( "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" + "gitlab.com/elixxir/client/interfaces" "gitlab.com/elixxir/client/stoppable" "gitlab.com/elixxir/client/storage" "gitlab.com/elixxir/client/storage/reception" @@ -149,6 +150,7 @@ func generateIdentities(protoIds []ephemeral.ProtoIdentity, ourId *id.ID, StartValid: eid.Start.Add(-validityGracePeriod), EndValid: eid.End.Add(validityGracePeriod), Ephemeral: false, + ExtraChecks: interfaces.DefaultExtraChecks, } } diff --git a/single/transmission.go b/single/transmission.go index 1b8bfddc05864b1ae790ba5af0193158f882bc8b..30f2f6c90a3cc5e5e8f6ece6cb459fc15ec1aa57 100644 --- a/single/transmission.go +++ b/single/transmission.go @@ -11,6 +11,7 @@ import ( "fmt" "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" + "gitlab.com/elixxir/client/interfaces" "gitlab.com/elixxir/client/interfaces/params" "gitlab.com/elixxir/client/interfaces/utility" "gitlab.com/elixxir/client/storage/reception" @@ -92,7 +93,7 @@ func (m *Manager) transmitSingleUse(partner contact2.Contact, payload []byte, Source: rid, AddressSize: addressSize, End: timeStart.Add(2 * timeout), - ExtraChecks: 10, + ExtraChecks: interfaces.DefaultExtraChecks, StartValid: timeStart.Add(-2 * timeout), EndValid: timeStart.Add(2 * timeout), Ephemeral: true, diff --git a/storage/reception/store.go b/storage/reception/store.go index 7a22c05f4ea7c2609ad0c835a69c31983346eefe..a73d941edf005ec22e2433fd74dd462f889ac2b7 100644 --- a/storage/reception/store.go +++ b/storage/reception/store.go @@ -176,7 +176,7 @@ func (s *Store) AddIdentity(identity Identity) error { // Do not make duplicates of IDs if _, ok := s.present[idH]; ok { jww.DEBUG.Printf("Ignoring duplicate identity for %d (%s)", - identity.EphId, identity.Source) + identity.EphId.Int64(), identity.Source) return nil } @@ -248,6 +248,7 @@ func (s *Store) SetToExpire(addressSize uint8) { func (s *Store) prune(now time.Time) { lengthBefore := len(s.active) + var pruned []int64 // Prune the list for i := 0; i < len(s.active); i++ { @@ -257,6 +258,7 @@ func (s *Store) prune(now time.Time) { jww.ERROR.Printf("Failed to delete Identity for %s: %+v", inQuestion, err) } + pruned = append(pruned, inQuestion.EphId.Int64()) s.active = append(s.active[:i], s.active[i+1:]...) @@ -266,7 +268,7 @@ func (s *Store) prune(now time.Time) { // Save the list if it changed if lengthBefore != len(s.active) { - jww.INFO.Printf("Pruned %d identities", lengthBefore-len(s.active)) + jww.INFO.Printf("Pruned %d identities [%+v]", lengthBefore-len(s.active), pruned) if err := s.save(); err != nil { jww.FATAL.Panicf("Failed to store reception storage: %+v", err) }