diff --git a/cmd/root.go b/cmd/root.go index a3bd31ef5c22245504283d8901ef2f3c3c315c95..a9c6005811a043ebd469d011361be42e772408a3 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -13,8 +13,10 @@ import ( "encoding/binary" "encoding/hex" "encoding/json" + "errors" "fmt" "gitlab.com/elixxir/client/cmix" + "io/fs" "io/ioutil" "log" "os" @@ -536,7 +538,7 @@ func createClient() *api.Client { backupPass := []byte(viper.GetString("backupPass")) // create a new client if none exist - if _, err := os.Stat(storeDir); os.IsNotExist(err) { + if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) { // Load NDF ndfJSON, err := ioutil.ReadFile(viper.GetString("ndf")) if err != nil { diff --git a/cmix/identity/tracker.go b/cmix/identity/tracker.go index 93cde203c4ca3f3f55516783a14fddcb4d0e329e..1622fc61dafcc4d258ed68a46c3cf93ef7979443 100644 --- a/cmix/identity/tracker.go +++ b/cmix/identity/tracker.go @@ -11,7 +11,7 @@ import ( "encoding/json" "github.com/pkg/errors" "io" - "os" + "io/fs" "sync" "time" @@ -85,7 +85,7 @@ func NewOrLoadTracker(session storage.Session, addrSpace address.Space) *manager // Load this structure err := t.load() - if err != nil && os.IsNotExist(err) { + if err != nil && errors.Is(err, fs.ErrNotExist) { oldTimestamp, err2 := getOldTimestampStore(t.session) if err2 == nil { jww.WARN.Printf("No tracked identities found, creating a new " + diff --git a/e2e/manager.go b/e2e/manager.go index 853303bbe20633da76ff329ee6f6f4a99ec769e1..38756fc168d8fad2cc65fe3b23db14b494b7f3c7 100644 --- a/e2e/manager.go +++ b/e2e/manager.go @@ -2,7 +2,6 @@ package e2e import ( "encoding/json" - "fmt" "strings" "time" @@ -95,7 +94,6 @@ func LoadLegacy(kv *versioned.KV, net cmix.Client, myID *id.ID, // this would be a case where LoadLegacy is most likely not the correct // code-path the caller should be following. if _, err := kv.Get(e2eRekeyParamsKey, e2eRekeyParamsVer); err != nil && !strings.Contains(err.Error(), "object not found") { - fmt.Printf("err: %v", err) return nil, errors.New("E2E rekey params are already on disk, " + "LoadLegacy should not be called") } diff --git a/e2e/parse/conversation/partner.go b/e2e/parse/conversation/partner.go index 28349a8edba998c8c47c9f8225a678aaaafd20a6..06155c697b6674c16261cb84af74ccb714feb69c 100644 --- a/e2e/parse/conversation/partner.go +++ b/e2e/parse/conversation/partner.go @@ -14,8 +14,8 @@ import ( "gitlab.com/elixxir/client/storage/versioned" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/netTime" + "io/fs" "math" - "os" "strings" "sync" ) @@ -51,7 +51,7 @@ type conversationDisk struct { // saved to KV, and returned. func LoadOrMakeConversation(kv *versioned.KV, partner *id.ID) *Conversation { c, err := loadConversation(kv, partner) - if err != nil && !(os.IsNotExist(err) || strings.Contains(err.Error(), "object not found")) { + if err != nil && !(errors.Is(err, fs.ErrNotExist) || strings.Contains(err.Error(), "object not found")) { jww.FATAL.Panicf("Failed to load conversation from storage: %+v", err) } else if c == nil { // Create new conversation and save to KV if one does not exist diff --git a/storage/ud/store.go b/storage/ud/store.go index 64325e317bef67ef2d192ab64e70ba32da2d5365..45b7ffdc4e1e516445e0761f7bad08b9ca666e0c 100644 --- a/storage/ud/store.go +++ b/storage/ud/store.go @@ -8,6 +8,7 @@ import ( "gitlab.com/elixxir/client/storage/versioned" "gitlab.com/elixxir/primitives/fact" "gitlab.com/xx_network/primitives/netTime" + "io/fs" "strings" ) @@ -113,7 +114,7 @@ func NewOrLoadStore(kv *versioned.KV) (*Store, error) { if err := s.load(); err != nil { if strings.Contains(err.Error(), "object not found") || - strings.Contains(err.Error(), "no such file or directory") { + errors.Is(err, fs.ErrNotExist) { return s, s.save() } }