From c747aa25fd55f8bcf36728610bcefdcaaaabff06 Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@elixxir.io>
Date: Thu, 14 Jul 2022 17:20:55 -0500
Subject: [PATCH] cleanup cmd code path
---
cmd/backup.go | 9 +++------
cmd/init.go | 18 ++++++------------
cmd/precan.go | 9 +++------
cmd/proto.go | 9 +++------
4 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/cmd/backup.go b/cmd/backup.go
index 7f95a2210..c8a5c7860 100644
--- a/cmd/backup.go
+++ b/cmd/backup.go
@@ -28,10 +28,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
jww.INFO.Printf("Using Backup sender")
// create a new client if none exist
- var net *xxdk.Cmix
- var identity xxdk.ReceptionIdentity
- _, err := os.Stat(storeDir)
- if errors.Is(err, fs.ErrNotExist) {
+ if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
if err != nil {
@@ -76,13 +73,13 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
}
}
// Initialize from storage
- net, err = xxdk.LoadCmix(storeDir, password, cmixParams)
+ net, err := xxdk.LoadCmix(storeDir, password, cmixParams)
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
// Load or initialize xxdk.ReceptionIdentity storage
- identity, err = xxdk.LoadReceptionIdentity(identityStorageKey, net)
+ identity, err := xxdk.LoadReceptionIdentity(identityStorageKey, net)
if err != nil {
identity, err = xxdk.MakeLegacyReceptionIdentity(net)
if err != nil {
diff --git a/cmd/init.go b/cmd/init.go
index 13932847b..993ee81db 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -78,10 +78,7 @@ func loadOrInitMessenger(forceLegacy bool, password []byte, storeDir, regCode st
jww.INFO.Printf("Using normal sender")
// create a new client if none exist
- var net *xxdk.Cmix
- var identity xxdk.ReceptionIdentity
- _, err := os.Stat(storeDir)
- if errors.Is(err, fs.ErrNotExist) {
+ if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
if err != nil {
@@ -95,13 +92,13 @@ func loadOrInitMessenger(forceLegacy bool, password []byte, storeDir, regCode st
}
// Initialize from storage
- net, err = xxdk.LoadCmix(storeDir, password, cmixParams)
+ net, err := xxdk.LoadCmix(storeDir, password, cmixParams)
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
// Load or initialize xxdk.ReceptionIdentity storage
- identity, err = xxdk.LoadReceptionIdentity(identityStorageKey, net)
+ identity, err := xxdk.LoadReceptionIdentity(identityStorageKey, net)
if err != nil {
if forceLegacy {
jww.INFO.Printf("Forcing legacy sender")
@@ -133,10 +130,7 @@ func loadOrInitVanity(password []byte, storeDir, regCode, userIdPrefix string,
jww.INFO.Printf("Using Vanity sender")
// create a new client if none exist
- var net *xxdk.Cmix
- var identity xxdk.ReceptionIdentity
- _, err := os.Stat(storeDir)
- if errors.Is(err, fs.ErrNotExist) {
+ if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
if err != nil {
@@ -150,13 +144,13 @@ func loadOrInitVanity(password []byte, storeDir, regCode, userIdPrefix string,
}
}
// Initialize from storage
- net, err = xxdk.LoadCmix(storeDir, password, cmixParams)
+ net, err := xxdk.LoadCmix(storeDir, password, cmixParams)
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
// Load or initialize xxdk.ReceptionIdentity storage
- identity, err = xxdk.LoadReceptionIdentity(identityStorageKey, net)
+ identity, err := xxdk.LoadReceptionIdentity(identityStorageKey, net)
if err != nil {
identity, err = xxdk.MakeLegacyReceptionIdentity(net)
if err != nil {
diff --git a/cmd/precan.go b/cmd/precan.go
index c0b7dcb5b..84076dff5 100644
--- a/cmd/precan.go
+++ b/cmd/precan.go
@@ -28,10 +28,7 @@ func loadOrInitPrecan(precanId uint, password []byte, storeDir string,
jww.INFO.Printf("Using Precanned sender")
// create a new client if none exist
- var net *xxdk.Cmix
- var identity xxdk.ReceptionIdentity
- _, err := os.Stat(storeDir)
- if errors.Is(err, fs.ErrNotExist) {
+ if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
if err != nil {
@@ -44,13 +41,13 @@ func loadOrInitPrecan(precanId uint, password []byte, storeDir string,
}
}
// Initialize from storage
- net, err = xxdk.LoadCmix(storeDir, password, cmixParams)
+ net, err := xxdk.LoadCmix(storeDir, password, cmixParams)
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
// Load or initialize xxdk.ReceptionIdentity storage
- identity, err = xxdk.LoadReceptionIdentity(identityStorageKey, net)
+ identity, err := xxdk.LoadReceptionIdentity(identityStorageKey, net)
if err != nil {
identity, err = xxdk.MakeLegacyReceptionIdentity(net)
if err != nil {
diff --git a/cmd/proto.go b/cmd/proto.go
index 9fb2b9835..b8585ca78 100644
--- a/cmd/proto.go
+++ b/cmd/proto.go
@@ -26,10 +26,7 @@ func loadOrInitProto(protoUserPath string, password []byte, storeDir string,
jww.INFO.Printf("Using Proto sender")
// create a new client if none exist
- var net *xxdk.Cmix
- var identity xxdk.ReceptionIdentity
- _, err := os.Stat(storeDir)
- if errors.Is(err, fs.ErrNotExist) {
+ if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
if err != nil {
@@ -54,13 +51,13 @@ func loadOrInitProto(protoUserPath string, password []byte, storeDir string,
}
}
// Initialize from storage
- net, err = xxdk.LoadCmix(storeDir, password, cmixParams)
+ net, err := xxdk.LoadCmix(storeDir, password, cmixParams)
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
// Load or initialize xxdk.ReceptionIdentity storage
- identity, err = xxdk.LoadReceptionIdentity(identityStorageKey, net)
+ identity, err := xxdk.LoadReceptionIdentity(identityStorageKey, net)
if err != nil {
identity, err = xxdk.MakeLegacyReceptionIdentity(net)
if err != nil {
--
GitLab