From 627c37f2757d77162a99260e37a05817671299ee Mon Sep 17 00:00:00 2001
From: greg stone <greg.stone@indra.org>
Date: Wed, 1 Mar 2023 07:34:59 +0000
Subject: [PATCH] p2p-key should no longer be passed via flag or env.

---
 pkg/p2p/configure.go | 8 ++++++--
 pkg/p2p/flags.go     | 8 --------
 pkg/p2p/server.go    | 2 +-
 pkg/p2p/util.go      | 2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkg/p2p/configure.go b/pkg/p2p/configure.go
index 2b047d44..ce5fe019 100644
--- a/pkg/p2p/configure.go
+++ b/pkg/p2p/configure.go
@@ -18,6 +18,10 @@ func configure() {
 	configureSeeds()
 }
 
+var (
+	storeKeyKey = "p2p-key"
+)
+
 func configureKey() {
 
 	log.I.Ln("looking for key in storage")
@@ -28,7 +32,7 @@ func configureKey() {
 
 	err = storage.View(func(txn *badger.Txn) error {
 
-		if item, err = txn.Get([]byte(keyFlag)); err != nil {
+		if item, err = txn.Get([]byte(storeKeyKey)); err != nil {
 			return err
 		}
 
@@ -50,7 +54,7 @@ func configureKey() {
 		}
 
 		err = storage.Update(func(txn *badger.Txn) error {
-			err = txn.Set([]byte(keyFlag), keyBytes)
+			err = txn.Set([]byte(storeKeyKey), keyBytes)
 			check(err)
 			return nil
 		})
diff --git a/pkg/p2p/flags.go b/pkg/p2p/flags.go
index 86eb1125..77dd98fe 100644
--- a/pkg/p2p/flags.go
+++ b/pkg/p2p/flags.go
@@ -6,14 +6,12 @@ import (
 )
 
 var (
-	keyFlag     = "p2p-key"
 	listenFlag  = "p2p-listen"
 	seedFlag    = "p2p-seed"
 	connectFlag = "p2p-connect"
 )
 
 var (
-	key        string
 	listeners  []string
 	seeds      []string
 	connectors []string
@@ -21,12 +19,6 @@ var (
 
 func InitFlags(cmd *cobra.Command) {
 
-	cmd.Flags().StringVarP(&key, keyFlag, "",
-		"",
-		"the base58 encoded private key for the seed node")
-
-	viper.BindPFlag(keyFlag, cmd.Flags().Lookup(keyFlag))
-
 	cmd.PersistentFlags().StringSliceVarP(&listeners, listenFlag, "",
 		[]string{
 			"/ip4/127.0.0.1/tcp/8337",
diff --git a/pkg/p2p/server.go b/pkg/p2p/server.go
index 9b17f211..6d1041c4 100644
--- a/pkg/p2p/server.go
+++ b/pkg/p2p/server.go
@@ -63,7 +63,7 @@ func run() {
 func Run() {
 
 	//storage.Update(func(txn *badger.Txn) error {
-	//	txn.Delete([]byte(keyFlag))
+	//	txn.Delete([]byte(storeKeyKey))
 	//	return nil
 	//})
 
diff --git a/pkg/p2p/util.go b/pkg/p2p/util.go
index 98bb0453..8a021ba3 100644
--- a/pkg/p2p/util.go
+++ b/pkg/p2p/util.go
@@ -50,7 +50,7 @@ func Base58Decode(key string) (priv crypto.PrivKey, err error) {
 //			return
 //		}
 //
-//		viper.Set(keyFlag, key)
+//		viper.Set(storeKeyKey, key)
 //
 //		return
 //	}