From 9ef4717c23cfe44e921bb0d6d7d9994624b16fc0 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Thu, 21 Jul 2022 19:35:44 +0000
Subject: [PATCH] Use ekv exists functionality instea of os.IsNotExist
---
auth/store/previousNegotiations.go | 4 ++--
auth/store/sentRequest.go | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/auth/store/previousNegotiations.go b/auth/store/previousNegotiations.go
index 37d9947e1..186d3af73 100644
--- a/auth/store/previousNegotiations.go
+++ b/auth/store/previousNegotiations.go
@@ -11,11 +11,11 @@ import (
"bytes"
"encoding/binary"
"encoding/json"
- "os"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/storage/versioned"
"gitlab.com/elixxir/crypto/e2e/auth"
+ "gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
@@ -140,7 +140,7 @@ func (s *Store) newOrLoadPreviousNegotiations() (map[id.ID]bool, error) {
return nil, err
}
}
- if os.IsNotExist(err) {
+ if !ekv.Exists(err) {
newPreviousNegotiations := make(map[id.ID]bool)
obj := &versioned.Object{
Version: negotiationPartnersVersion,
diff --git a/auth/store/sentRequest.go b/auth/store/sentRequest.go
index 9c70605aa..3794502bf 100644
--- a/auth/store/sentRequest.go
+++ b/auth/store/sentRequest.go
@@ -11,7 +11,6 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
- "os"
"sync"
"github.com/cloudflare/circl/dh/sidh"
@@ -20,6 +19,7 @@ import (
sidhinterface "gitlab.com/elixxir/client/interfaces/sidh"
"gitlab.com/elixxir/client/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
+ "gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
@@ -77,7 +77,7 @@ func loadSentRequest(kv *versioned.KV, partner *id.ID, grp *cyclic.Group) (*Sent
obj, err := kv.Get(srKey, currentSentRequestVersion)
// V0 Upgrade Path
- if os.IsNotExist(err) {
+ if !ekv.Exists(err) {
obj2, err2 := kv.Get(makeOldSentRequestKey(partner), 0)
if err2 != nil {
jww.DEBUG.Printf("v0 loadSentRequest: %+v", err)
--
GitLab