From acda7de754c52515c0f8e5e5db02831583a8410d Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Thu, 9 Sep 2021 14:02:31 -0700
Subject: [PATCH] Remove mnemonic logic from storage package
---
storage/mnemonic.go | 37 -------------------------------------
storage/session.go | 10 ----------
2 files changed, 47 deletions(-)
delete mode 100644 storage/mnemonic.go
diff --git a/storage/mnemonic.go b/storage/mnemonic.go
deleted file mode 100644
index ee9d955ca..000000000
--- a/storage/mnemonic.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package storage
-
-import (
- "gitlab.com/elixxir/client/storage/versioned"
- "gitlab.com/xx_network/primitives/netTime"
-)
-
-const (
- mnemonicKvKey = "mnemonic"
- mnemonicKvVersion = 0
- mnemonicPath = "/.recovery"
-)
-
-func (s *Session) SaveMnemonicInformation(data []byte) error {
- s.mnemonicMux.Lock()
- defer s.mnemonicMux.Unlock()
-
- vo := &versioned.Object{
- Version: mnemonicKvVersion,
- Timestamp: netTime.Now(),
- Data: data,
- }
-
- return s.mnemonicKV.Set(mnemonicKvKey, mnemonicKvVersion, vo)
-}
-
-func (s *Session) LoadMnemonicInformation() ([]byte, error) {
- s.mux.RLock()
- defer s.mux.RUnlock()
-
- vo, err := s.mnemonicKv.Get(mnemonicKvKey, mnemonicKvVersion)
- if err != nil {
- return nil, err
- }
-
- return vo.Data, err
-}
diff --git a/storage/session.go b/storage/session.go
index aadf9ffb8..f8d543d4a 100644
--- a/storage/session.go
+++ b/storage/session.go
@@ -47,11 +47,8 @@ const currentSessionVersion = 0
// Session object, backed by encrypted filestore
type Session struct {
kv *versioned.KV
- mnemonicKV *versioned.KV
- mnemonicKv *versioned.KV
mux sync.RWMutex
- mnemonicMux sync.RWMutex
//memoized data
regStatus RegistrationStatus
@@ -82,16 +79,9 @@ func initStore(baseDir, password string) (*Session, error) {
"Failed to create storage session")
}
- // Create a separate file store system for account recovery
- mnemonicFS, err := ekv.NewFilestore(baseDir+mnemonicPath, password)
- if err != nil {
- return nil, errors.WithMessage(err,
- "Failed to create mnemonic store")
- }
s = &Session{
kv: versioned.NewKV(fs),
- mnemonicKV: versioned.NewKV(mnemonicFS),
}
return s, nil
--
GitLab