[FAB-3004] Remove extraneous flags

See [FAB-3004]. The fabric-ca-server has extraneous flags which are not used by the runtime. This change set removes them and removes resulting dead code. Change-Id: I50843be43dfa82a98d55a843d030f974a463a874 Signed-off-by: Keith Smith <[email protected]>
hyperledger · Apr 11, 2017 · db76a08 · db76a08
1 parent ee34334
commit db76a08
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 20 deletions.
diff --git a/cmd/fabric-ca-server/init.go b/cmd/fabric-ca-server/init.go
@@ -40,8 +40,6 @@ var initCmd = &cobra.Command{
 func init() {
 	initCmd.RunE = runInit
 	rootCmd.AddCommand(initCmd)
-	flags := initCmd.Flags()
-	registerCommonFlags(flags)
 }
 
 // The server init main logic

diff --git a/cmd/fabric-ca-server/main.go b/cmd/fabric-ca-server/main.go
@@ -24,7 +24,6 @@ import (
 	"github.com/hyperledger/fabric-ca/lib"
 	"github.com/hyperledger/fabric-ca/util"
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 )
 
@@ -97,17 +96,6 @@ func RunMain(args []string) error {
 	return err
 }
 
-func registerCommonFlags(flags *pflag.FlagSet) {
-	util.FlagString(flags, "ca.keyfile", "", "key.pem",
-		"PEM-encoded key file for certificate issuance")
-	util.FlagString(flags, "ca.certfile", "", "cert.pem",
-		"PEM-encoded certificate file used for certificate issuance")
-	util.FlagString(flags, "tls.keyfile", "", "key.pem",
-		"PEM-encoded key file used for TLS")
-	util.FlagString(flags, "tls.certfile", "", "cert.pem",
-		"PEM-encoded certificate file used for TLS")
-}
-
 // Get a server for the init and start commands
 func getServer() *lib.Server {
 	return &lib.Server{

diff --git a/cmd/fabric-ca-server/start.go b/cmd/fabric-ca-server/start.go
@@ -19,8 +19,6 @@ package main
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric-ca/lib"
-	"github.com/hyperledger/fabric-ca/util"
 	"github.com/spf13/cobra"
 )
 
@@ -33,10 +31,6 @@ var startCmd = &cobra.Command{
 func init() {
 	startCmd.RunE = runStart
 	rootCmd.AddCommand(startCmd)
-	flags := startCmd.Flags()
-	util.FlagString(flags, "addr", "a", lib.DefaultServerAddr, "Listening address")
-	util.FlagInt(flags, "port", "p", lib.DefaultServerPort, "Listening port")
-	registerCommonFlags(flags)
 }
 
 // The server start main logic