Remove deprecated bootstrapping stake flags

Author: tim-barry

cmd/bootstrap/cmd/clustering.go

@@ -42,7 +42,6 @@ func addClusterAssignmentCmdFlags() {
 	clusterAssignmentCmd.Flags().StringVar(&flagPartnerNodeInfoDir, "partner-dir", "", "path to directory "+
 		"containing one JSON file starting with node-info.pub.<NODE_ID>.json for every partner node (fields "+
 		" in the JSON file: Role, Address, NodeID, NetworkPubKey, StakingPubKey)")
-	clusterAssignmentCmd.Flags().StringVar(&deprecatedFlagPartnerStakes, "partner-stakes", "", "deprecated: use --partner-weights")
 	clusterAssignmentCmd.Flags().StringVar(&flagPartnerWeights, "partner-weights", "", "path to a JSON file containing "+
 		"a map from partner node's NodeID to their stake")
 
@@ -64,15 +63,6 @@ func addClusterAssignmentCmdFlags() {
 }
 
 func clusterAssignment(cmd *cobra.Command, args []string) {
-	// maintain backward compatibility with old flag name
-	if deprecatedFlagPartnerStakes != "" {
-		log.Warn().Msg("using deprecated flag --partner-stakes (use --partner-weights instead)")
-		if flagPartnerWeights == "" {
-			flagPartnerWeights = deprecatedFlagPartnerStakes
-		} else {
-			log.Fatal().Msg("cannot use both --partner-stakes and --partner-weights flags (use only --partner-weights)")
-		}
-	}
 	// Read partner node's information and internal node's information.
 	// With "internal nodes" we reference nodes, whose private keys we have. In comparison,
 	// for "partner nodes" we generally do not have their keys. However, we allow some overlap,

cmd/bootstrap/cmd/finalize.go

@@ -31,11 +31,9 @@ import (
 )
 
 var (
-	flagConfig                  string
-	flagInternalNodePrivInfoDir string
-	flagPartnerNodeInfoDir      string
-	// Deprecated: use flagPartnerWeights instead
-	deprecatedFlagPartnerStakes           string
+	flagConfig                            string
+	flagInternalNodePrivInfoDir           string
+	flagPartnerNodeInfoDir                string
 	flagPartnerWeights                    string
 	flagDKGDataPath                       string
 	flagRootBlockPath                     string
@@ -70,8 +68,6 @@ func addFinalizeCmdFlags() {
 	finalizeCmd.Flags().StringVar(&flagPartnerNodeInfoDir, "partner-dir", "", "path to directory "+
 		"containing one JSON file starting with node-info.pub.<NODE_ID>.json for every partner node (fields "+
 		" in the JSON file: Role, Address, NodeID, NetworkPubKey, StakingPubKey, StakingKeyPoP)")
-	// Deprecated: remove this flag
-	finalizeCmd.Flags().StringVar(&deprecatedFlagPartnerStakes, "partner-stakes", "", "deprecated: use partner-weights instead")
 	finalizeCmd.Flags().StringVar(&flagPartnerWeights, "partner-weights", "", "path to a JSON file containing "+
 		"a map from partner node's NodeID to their weight")
 	finalizeCmd.Flags().StringVar(&flagDKGDataPath, "dkg-data", "", "path to a JSON file containing data as output from the random beacon key generation")
@@ -102,17 +98,6 @@ func addFinalizeCmdFlags() {
 }
 
 func finalize(cmd *cobra.Command, args []string) {
-
-	// maintain backward compatibility with old flag name
-	if deprecatedFlagPartnerStakes != "" {
-		log.Warn().Msg("using deprecated flag --partner-stakes (use --partner-weights instead)")
-		if flagPartnerWeights == "" {
-			flagPartnerWeights = deprecatedFlagPartnerStakes
-		} else {
-			log.Fatal().Msg("cannot use both --partner-stakes and --partner-weights flags (use only --partner-weights)")
-		}
-	}
-
 	log.Info().Msg("collecting partner network and staking keys")
 	partnerNodes, err := common.ReadFullPartnerNodeInfos(log, flagPartnerWeights, flagPartnerNodeInfoDir)
 	if err != nil {

cmd/bootstrap/cmd/genconfig.go

@@ -17,24 +17,11 @@ var (
 	flagNodesConsensus    int
 	flagNodesExecution    int
 	flagNodesVerification int
-	// Deprecated: use flagWeight instead
-	deprecatedFlagStake uint64
-	flagWeight          uint64
+	flagWeight            uint64
 )
 
 // genconfigCmdRun generates the node-config.json file
 func genconfigCmdRun(_ *cobra.Command, _ []string) {
-
-	// maintain backward compatibility with old flag name
-	if deprecatedFlagStake != 0 {
-		log.Warn().Msg("using deprecated flag --stake (use --weight instead)")
-		if flagWeight == 0 {
-			flagWeight = deprecatedFlagStake
-		} else {
-			log.Fatal().Msg("cannot use both --stake and --weight flags (use only --weight)")
-		}
-	}
-
 	if flagWeight != flow.DefaultInitialWeight {
 		log.Warn().Msgf("using non-standard initial weight %d!=%d - make sure this is desired", flagWeight, flow.DefaultInitialWeight)
 	}
@@ -85,7 +72,6 @@ func init() {
 	genconfigCmd.Flags().IntVar(&flagNodesExecution, "execution", 2, "number of execution nodes")
 	genconfigCmd.Flags().IntVar(&flagNodesVerification, "verification", 1, "number of verification nodes")
 	genconfigCmd.Flags().Uint64Var(&flagWeight, "weight", flow.DefaultInitialWeight, "weight for all nodes")
-	genconfigCmd.Flags().Uint64Var(&deprecatedFlagStake, "stake", 0, "deprecated: use --weight")
 }
 
 func createConf(r flow.Role, i int) model.NodeConfig {

cmd/bootstrap/cmd/rootblock.go

@@ -79,7 +79,6 @@ func addRootBlockCmdFlags() {
 	rootBlockCmd.Flags().StringVar(&flagPartnerNodeInfoDir, "partner-dir", "", "path to directory "+
 		"containing one JSON file starting with node-info.pub.<NODE_ID>.json for every partner node (fields "+
 		" in the JSON file: Role, Address, NodeID, NetworkPubKey, StakingPubKey)")
-	rootBlockCmd.Flags().StringVar(&deprecatedFlagPartnerStakes, "partner-stakes", "", "deprecated: use --partner-weights")
 	rootBlockCmd.Flags().StringVar(&flagPartnerWeights, "partner-weights", "", "path to a JSON file containing "+
 		"a map from partner node's NodeID to their stake")
 
@@ -146,15 +145,6 @@ func addRootBlockCmdFlags() {
 }
 
 func rootBlock(cmd *cobra.Command, args []string) {
-	// maintain backward compatibility with old flag name
-	if deprecatedFlagPartnerStakes != "" {
-		log.Warn().Msg("using deprecated flag --partner-stakes (use --partner-weights instead)")
-		if flagPartnerWeights == "" {
-			flagPartnerWeights = deprecatedFlagPartnerStakes
-		} else {
-			log.Fatal().Msg("cannot use both --partner-stakes and --partner-weights flags (use only --partner-weights)")
-		}
-	}
 	if deprecatedFlagProtocolVersion != 0 {
 		log.Warn().Msg("using deprecated flag --protocol-version; please remove this flag from your workflow, it is ignored and will be removed in a future release")
 	}