Skip to content
Snippets Groups Projects

Make BuildReceptionIdentity public, and make backup restore function return a...

Merged Jake Taylor requested to merge hotfix/integration into hotfix/RefactorCMD
19 files
+ 447
139
Compare changes
  • Side-by-side
  • Inline
Files
19
+ 4
0
@@ -8,6 +8,7 @@ package backup
@@ -8,6 +8,7 @@ package backup
import (
import (
"github.com/pkg/errors"
"github.com/pkg/errors"
 
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/e2e"
"gitlab.com/elixxir/client/e2e"
"gitlab.com/elixxir/client/e2e/rekey"
"gitlab.com/elixxir/client/e2e/rekey"
"gitlab.com/elixxir/client/storage"
"gitlab.com/elixxir/client/storage"
@@ -35,6 +36,9 @@ func NewClientFromBackup(ndfJSON, storageDir string, sessionPassword,
@@ -35,6 +36,9 @@ func NewClientFromBackup(ndfJSON, storageDir string, sessionPassword,
"Failed to unmarshal decrypted client contents.")
"Failed to unmarshal decrypted client contents.")
}
}
 
jww.INFO.Printf("Decrypted backup ID to Restore: %v",
 
backUp.ReceptionIdentity.ComputedID)
 
userInfo := user.NewUserFromBackup(backUp)
userInfo := user.NewUserFromBackup(backUp)
def, err := xxdk.ParseNDF(ndfJSON)
def, err := xxdk.ParseNDF(ndfJSON)
Loading