diff --git a/storage/mnemonic.go b/storage/mnemonic.go deleted file mode 100644 index ee9d955caaf883eade5adc6cc086c9b10517d498..0000000000000000000000000000000000000000 --- 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 aadf9ffb849726ff1d775a37c101d52a3143b274..f8d543d4a0c65f4720a734fe9f86f4942de5bf38 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