From 9d8b8868d1c632fac1fc4f379008eb43ec3d75d3 Mon Sep 17 00:00:00 2001 From: "Richard T. Carback III" <rick.carback@gmail.com> Date: Tue, 26 Apr 2022 16:14:40 +0000 Subject: [PATCH] Make sure fingerprints are deleted when deleting sent requests --- auth/reset.go | 2 ++ auth/store/deletion.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/auth/reset.go b/auth/reset.go index a688926b9..9f6114f46 100644 --- a/auth/reset.go +++ b/auth/reset.go @@ -30,6 +30,8 @@ func (s *state) Reset(partner contact.Contact) (id.Round, error) { _ = s.store.DeleteSentRequest(partner.ID) _ = s.store.DeleteReceivedRequest(partner.ID) + _ = s.store.DeleteSentRequest(partner.ID) + // Try to initiate a clean session request return s.request(partner, fact.FactList{}, true) } diff --git a/auth/store/deletion.go b/auth/store/deletion.go index 677e1d02c..c02e39571 100644 --- a/auth/store/deletion.go +++ b/auth/store/deletion.go @@ -2,6 +2,7 @@ package store import ( "fmt" + "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" "gitlab.com/xx_network/primitives/id" @@ -114,6 +115,7 @@ func (s *Store) DeleteSentRequest(partner *id.ID) error { sr.mux.Lock() s.mux.Lock() _, exist = s.sentByID[*partner] + s.srh.Delete(sr) delete(s.receivedByID, *partner) s.mux.Unlock() sr.mux.Unlock() -- GitLab