From 01aad324568c43d2b9a54ba555e5f1ceb8bd912b Mon Sep 17 00:00:00 2001
From: joshemb <josh@elixxir.io>
Date: Wed, 20 Jul 2022 12:44:26 -0700
Subject: [PATCH] Have all viper.Get calls use cmd flag constants
---
cmd/backup.go | 6 +++---
cmd/broadcast.go | 8 ++++----
cmd/dumpRounds.go | 2 +-
cmd/fileTransfer.go | 2 +-
cmd/group.go | 2 +-
cmd/init.go | 12 ++++++------
cmd/root.go | 2 +-
cmd/single.go | 2 +-
cmd/ud.go | 4 ++--
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/cmd/backup.go b/cmd/backup.go
index f3c7f308d..ecac98375 100644
--- a/cmd/backup.go
+++ b/cmd/backup.go
@@ -30,7 +30,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
// create a new client if none exist
if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
- ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+ ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
@@ -44,7 +44,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
}
// Write the backup JSON to file
- err = utils.WriteFileDef(viper.GetString("backupJsonOut"), backupJson)
+ err = utils.WriteFileDef(viper.GetString(backupJsonOutFlag), backupJson)
if err != nil {
jww.FATAL.Panicf("Failed to write backup to file: %+v", err)
}
@@ -56,7 +56,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
jww.FATAL.Panicf("%+v", err)
}
- backupIdListPath := viper.GetString("backupIdList")
+ backupIdListPath := viper.GetString(backupIdListFlag)
if backupIdListPath != "" {
// Marshal backed up ID list to JSON
backedUpIdListJson, err := json.Marshal(backupIdList)
diff --git a/cmd/broadcast.go b/cmd/broadcast.go
index 1e43d1286..bdd460137 100644
--- a/cmd/broadcast.go
+++ b/cmd/broadcast.go
@@ -27,7 +27,7 @@ var broadcastCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
cmixParams, e2eParams := initParams()
authCbs := makeAuthCallbacks(
- viper.GetBool("unsafe-channel-creation"), e2eParams)
+ viper.GetBool(unsafeChannelCreationFlag), e2eParams)
client := initE2e(cmixParams, e2eParams, authCbs)
// Write user contact to file
@@ -148,8 +148,8 @@ var broadcastCmd = &cobra.Command{
/* Broadcast client setup */
// Select broadcast method
- symmetric := viper.GetString("symmetric")
- asymmetric := viper.GetString("asymmetric")
+ symmetric := viper.GetString(broadcastSymmetricFlag)
+ asymmetric := viper.GetString(broadcastAsymmetricFlag)
// Connect to broadcast channel
bcl, err := broadcast.NewBroadcastChannel(*channel, client.GetCmix(), client.GetRng())
@@ -187,7 +187,7 @@ var broadcastCmd = &cobra.Command{
go func() {
jww.INFO.Printf("Attempting to send broadcasts...")
- sendDelay := time.Duration(viper.GetUint("sendDelay"))
+ sendDelay := time.Duration(viper.GetUint(sendDelayFlag))
maxRetries := 10
retries := 0
for {
diff --git a/cmd/dumpRounds.go b/cmd/dumpRounds.go
index 4aa2f7ee8..79fe5a60a 100644
--- a/cmd/dumpRounds.go
+++ b/cmd/dumpRounds.go
@@ -34,7 +34,7 @@ var dumpRoundsCmd = &cobra.Command{
cmixParams, e2eParams := initParams()
authCbs := makeAuthCallbacks(
- viper.GetBool("unsafe-channel-creation"), e2eParams)
+ viper.GetBool(unsafeChannelCreationFlag), e2eParams)
client := initE2e(cmixParams, e2eParams, authCbs)
err := client.StartNetworkFollower(5 * time.Second)
if err != nil {
diff --git a/cmd/fileTransfer.go b/cmd/fileTransfer.go
index b44bdbf50..30420ff02 100644
--- a/cmd/fileTransfer.go
+++ b/cmd/fileTransfer.go
@@ -37,7 +37,7 @@ var ftCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
cmixParams, e2eParams := initParams()
authCbs := makeAuthCallbacks(
- viper.GetBool("unsafe-channel-creation"), e2eParams)
+ viper.GetBool(unsafeChannelCreationFlag), e2eParams)
client := initE2e(cmixParams, e2eParams, authCbs)
// Print user's reception ID and save contact file
diff --git a/cmd/group.go b/cmd/group.go
index 7e9b8c63b..9c5e1d09d 100644
--- a/cmd/group.go
+++ b/cmd/group.go
@@ -36,7 +36,7 @@ var groupCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
cmixParams, e2eParams := initParams()
authCbs := makeAuthCallbacks(
- viper.GetBool("unsafe-channel-creation"), e2eParams)
+ viper.GetBool(unsafeChannelCreationFlag), e2eParams)
client := initE2e(cmixParams, e2eParams, authCbs)
// Print user's reception ID
diff --git a/cmd/init.go b/cmd/init.go
index d278a0f9b..0c4b874ee 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -29,12 +29,12 @@ var initCmd = &cobra.Command{
Args: cobra.NoArgs,
Run: func(cmd *cobra.Command, args []string) {
// TODO: Handle userid-prefix argument
- storePassword := parsePassword(viper.GetString("password"))
- storeDir := viper.GetString("session")
- regCode := viper.GetString("regcode")
+ storePassword := parsePassword(viper.GetString(passwordFlag))
+ storeDir := viper.GetString(sessionFlag)
+ regCode := viper.GetString(regCodeFlag)
// Initialize from scratch
- ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+ ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
@@ -78,7 +78,7 @@ func loadOrInitCmix(password []byte, storeDir, regCode string,
// create a new client if none exist
if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
- ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+ ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
@@ -162,7 +162,7 @@ func loadOrInitVanity(password []byte, storeDir, regCode, userIdPrefix string,
// create a new client if none exist
if _, err := os.Stat(storeDir); errors.Is(err, fs.ErrNotExist) {
// Initialize from scratch
- ndfJson, err := ioutil.ReadFile(viper.GetString("ndf"))
+ ndfJson, err := ioutil.ReadFile(viper.GetString(ndfFlag))
if err != nil {
jww.FATAL.Panicf("%+v", err)
}
diff --git a/cmd/root.go b/cmd/root.go
index 905b5c259..921a28290 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -70,7 +70,7 @@ var rootCmd = &cobra.Command{
cmixParams, e2eParams := initParams()
authCbs := makeAuthCallbacks(
- viper.GetBool("unsafe-channel-creation"), e2eParams)
+ viper.GetBool(unsafeChannelCreationFlag), e2eParams)
client := initE2e(cmixParams, e2eParams, authCbs)
jww.INFO.Printf("Client Initialized...")
diff --git a/cmd/single.go b/cmd/single.go
index fb5cd1030..60c148fa3 100644
--- a/cmd/single.go
+++ b/cmd/single.go
@@ -35,7 +35,7 @@ var singleCmd = &cobra.Command{
cmixParams, e2eParams := initParams()
authCbs := makeAuthCallbacks(
- viper.GetBool("unsafe-channel-creation"), e2eParams)
+ viper.GetBool(unsafeChannelCreationFlag), e2eParams)
client := initE2e(cmixParams, e2eParams, authCbs)
// Write user contact to file
diff --git a/cmd/ud.go b/cmd/ud.go
index d7f79831d..dfc9f5e20 100644
--- a/cmd/ud.go
+++ b/cmd/ud.go
@@ -36,7 +36,7 @@ var udCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
cmixParams, e2eParams := initParams()
authCbs := makeAuthCallbacks(
- viper.GetBool("unsafe-channel-creation"), e2eParams)
+ viper.GetBool(unsafeChannelCreationFlag), e2eParams)
client := initE2e(cmixParams, e2eParams, authCbs)
// get user and save contact to file
@@ -63,7 +63,7 @@ var udCmd = &cobra.Command{
// Make user discovery manager
rng := client.GetRng()
- userToRegister := viper.GetString("register")
+ userToRegister := viper.GetString(udRegisterFlag)
jww.TRACE.Printf("[UD] Registering user %v...", userToRegister)
userDiscoveryMgr, err := ud.NewManager(client, client.GetComms(),
client.NetworkFollowerStatus, userToRegister, nil)
--
GitLab