From 4a1e73c8eb5adc0f5b7a81d2274a91dc27a013c1 Mon Sep 17 00:00:00 2001
From: David Stainton <dstainton@elixxir.io>
Date: Thu, 25 Aug 2022 14:44:22 -0400
Subject: [PATCH] ud: us kv.Exists
---
ud/channelIDTracking.go | 7 +------
ud/channelIDTracking_test.go | 6 +-----
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/ud/channelIDTracking.go b/ud/channelIDTracking.go
index c359f196b..9c66ba2fa 100644
--- a/ud/channelIDTracking.go
+++ b/ud/channelIDTracking.go
@@ -4,7 +4,6 @@ import (
"crypto/ed25519"
"encoding/json"
"errors"
- "os"
"sync"
"time"
@@ -185,12 +184,8 @@ var _ NameService = (*clientIDTracker)(nil)
func newclientIDTracker(comms channelLeaseComms, host *connect.Host, username string, kv *versioned.KV,
receptionIdentity xxdk.ReceptionIdentity, udPubKey ed25519.PublicKey, rngSource *fastRNG.StreamGenerator) *clientIDTracker {
- var err error
-
- // kv api sucks... forcing me to do this:
- objectNotFoundErr := "object not found"
reg, err := loadRegistrationDisk(kv)
- if os.IsNotExist(err) || err.Error() == objectNotFoundErr {
+ if !kv.Exists(err) {
rng := rngSource.GetStream()
defer rng.Close()
diff --git a/ud/channelIDTracking_test.go b/ud/channelIDTracking_test.go
index 2153b2b19..e058623ee 100644
--- a/ud/channelIDTracking_test.go
+++ b/ud/channelIDTracking_test.go
@@ -31,11 +31,7 @@ func TestLoadSaveRegistration(t *testing.T) {
registrationDisk, err := loadRegistrationDisk(kv)
require.Error(t, err)
- t.Logf("err is %v", err)
-
- // kv api sucks... forcing me to do this:
- objectNotFoundErr := "object not found"
- require.Equal(t, err.Error(), objectNotFoundErr)
+ require.False(t, kv.Exists(err))
err = saveRegistrationDisk(kv, reg)
require.NoError(t, err)
--
GitLab