From b2b7d48e95e3660e7aa667c9721db84a19ca3c76 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Fri, 22 Apr 2022 21:20:50 +0000
Subject: [PATCH] Make sure deletes are written to disk.
---
auth/store/receivedRequest.go | 8 ++++----
auth/store/store.go | 8 ++++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/auth/store/receivedRequest.go b/auth/store/receivedRequest.go
index ca02270f2..2a9eaa56d 100644
--- a/auth/store/receivedRequest.go
+++ b/auth/store/receivedRequest.go
@@ -2,6 +2,8 @@ package store
import (
"encoding/base64"
+ "sync"
+
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
@@ -10,7 +12,6 @@ import (
"gitlab.com/elixxir/client/storage/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/xx_network/primitives/id"
- "sync"
)
type ReceivedRequest struct {
@@ -61,15 +62,14 @@ func loadReceivedRequest(kv *versioned.KV, partner *id.ID) (
*ReceivedRequest, error) {
c, err := util.LoadContact(kv, partner)
-
- //loading with the new prefix path failed, try with the new
if err != nil {
return nil, errors.WithMessagef(err, "Failed to Load "+
"Received Auth Request Contact with %s",
partner)
}
- key, err := util.LoadSIDHPublicKey(kv, util.MakeSIDHPublicKeyKey(partner))
+ key, err := util.LoadSIDHPublicKey(kv,
+ util.MakeSIDHPublicKeyKey(partner))
if err != nil {
return nil, errors.WithMessagef(err, "Failed to Load "+
"Received Auth Request Partner SIDHkey with %s",
diff --git a/auth/store/store.go b/auth/store/store.go
index d9b06ae8e..241a090ef 100644
--- a/auth/store/store.go
+++ b/auth/store/store.go
@@ -77,7 +77,8 @@ func NewOrLoadStore(kv *versioned.KV, grp *cyclic.Group, srh SentRequestHandler)
"unmarshal SentRequestMap")
}
- jww.TRACE.Printf("%d found when loading AuthStore", len(requestList))
+ jww.TRACE.Printf("%d found when loading AuthStore, prefix %s",
+ len(requestList), kv.GetPrefix())
for _, rDisk := range requestList {
@@ -212,7 +213,8 @@ func (s *Store) AddReceived(c contact.Contact, key *sidh.PublicKey,
round rounds.Round) error {
s.mux.Lock()
defer s.mux.Unlock()
- jww.DEBUG.Printf("AddReceived new contact: %s", c.ID)
+ jww.DEBUG.Printf("AddReceived new contact: %s, prefix: %s",
+ c.ID, s.kv.GetPrefix())
if _, ok := s.receivedByID[*c.ID]; ok {
return errors.Errorf("Cannot add contact for partner "+
@@ -270,6 +272,7 @@ func (s *Store) HandleReceivedRequest(partner *id.ID, handler func(*ReceivedRequ
}
delete(s.receivedByID, *partner)
+ s.save()
rr.delete()
return nil
@@ -312,6 +315,7 @@ func (s *Store) HandleSentRequest(partner *id.ID, handler func(request *SentRequ
}
delete(s.receivedByID, *partner)
+ s.save()
sr.delete()
return nil
--
GitLab