feat: remove flags for hive test

Author: fearlessfe

cmd/shisui/main.go

@@ -44,20 +44,12 @@ var (
 		utils.PortalDataCapacityFlag,
 		utils.PortalLogLevelFlag,
 	}
-	hiveTestFlags = []cli.Flag{
-		utils.HiveBootNodeFlag,
-		utils.HiveClientPrivateKeyFlag,
-		utils.HiveLogLevelFlag,
-	}
 )
 
 func init() {
 	app.Action = shisui
 	app.Flags = flags.Merge(portalProtocolFlags, historyRpcFlags)
 	flags.AutoEnvVars(app.Flags, "SHISUI")
-
-	app.Flags = flags.Merge(app.Flags, hiveTestFlags)
-	flags.AutoEnvVars(hiveTestFlags, "HIVE")
 }
 
 func main() {
@@ -140,26 +132,25 @@ func getPortalHistoryConfig(ctx *cli.Context) (*PortalHistoryConfig, error) {
 		config.Protocol.NodeIP = netIp
 	}
 
-	if ctx.IsSet(utils.HiveLogLevelFlag.Name) {
-		config.LogLevel = ctx.Int(utils.HiveLogLevelFlag.Name)
-	}
-	if ctx.IsSet(utils.HiveBootNodeFlag.Name) {
-		bootNode := new(enode.Node)
-		err = bootNode.UnmarshalText([]byte(ctx.String(utils.HiveBootNodeFlag.Name)))
-		if err != nil {
-			return config, err
+	if ctx.IsSet(utils.PortalBootNodesFlag.Name) {
+		for _, node := range ctx.StringSlice(utils.PortalBootNodesFlag.Name) {
+			bootNode := new(enode.Node)
+			err = bootNode.UnmarshalText([]byte(node))
+			if err != nil {
+				return config, err
+			}
+			config.Protocol.BootstrapNodes = append(config.Protocol.BootstrapNodes, bootNode)
 		}
-		config.Protocol.BootstrapNodes = append(config.Protocol.BootstrapNodes, bootNode)
 	}
 	return config, nil
 }
 
 func setPrivateKey(ctx *cli.Context, config *PortalHistoryConfig) error {
 	var privateKey *ecdsa.PrivateKey
 	var err error
-	if ctx.IsSet(utils.HiveClientPrivateKeyFlag.Name) {
-		keyStr := ctx.String(utils.HiveClientPrivateKeyFlag.Name)
-		keyBytes, err := hexutil.Decode("0x" + keyStr)
+	if ctx.IsSet(utils.PortalPrivateKeyFlag.Name) {
+		keyStr := ctx.String(utils.PortalPrivateKeyFlag.Name)
+		keyBytes, err := hexutil.Decode(keyStr)
 		if err != nil {
 			return err
 		}

cmd/utils/flags.go

@@ -994,22 +994,16 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
 		Category: flags.PortalNetworkCategory,
 	}
 
-	HiveBootNodeFlag = &cli.StringFlag{
-		Name:     "bootnode",
-		Usage:    "bootnode of p2p network with ENR format for portal hive test",
-		Category: flags.PortalNetworkHiveCategory,
-	}
-
-	HiveClientPrivateKeyFlag = &cli.StringFlag{
-		Name:     "client.private.key",
-		Usage:    "private key of current p2p node for portal hive test",
-		Category: flags.PortalNetworkHiveCategory,
+	PortalPrivateKeyFlag = &cli.StringFlag{
+		Name:     "private.key",
+		Usage:    "private key of p2p node, hex format",
+		Category: flags.PortalNetworkCategory,
 	}
 
-	HiveLogLevelFlag = &cli.IntFlag{
-		Name:     "loglevel",
-		Usage:    "loglevel for portal hive test",
-		Category: flags.PortalNetworkHiveCategory,
+	PortalBootNodesFlag = &cli.StringSliceFlag{
+		Name:     "bootnode",
+		Usage:    "bootnode of p2p network with ENR format for portal hive test",
+		Category: flags.PortalNetworkCategory,
 	}
 )
 

internal/flags/categories.go

@@ -19,26 +19,25 @@ package flags
 import "github.com/urfave/cli/v2"
 
 const (
-	EthCategory               = "ETHEREUM"
-	BeaconCategory            = "BEACON CHAIN"
-	DevCategory               = "DEVELOPER CHAIN"
-	StateCategory             = "STATE HISTORY MANAGEMENT"
-	TxPoolCategory            = "TRANSACTION POOL (EVM)"
-	BlobPoolCategory          = "TRANSACTION POOL (BLOB)"
-	PerfCategory              = "PERFORMANCE TUNING"
-	AccountCategory           = "ACCOUNT"
-	APICategory               = "API AND CONSOLE"
-	NetworkingCategory        = "NETWORKING"
-	MinerCategory             = "MINER"
-	GasPriceCategory          = "GAS PRICE ORACLE"
-	VMCategory                = "VIRTUAL MACHINE"
-	LoggingCategory           = "LOGGING AND DEBUGGING"
-	MetricsCategory           = "METRICS AND STATS"
-	MiscCategory              = "MISC"
-	TestingCategory           = "TESTING"
-	DeprecatedCategory        = "ALIASED (deprecated)"
-	PortalNetworkCategory     = "PORTAL NETWORK"
-	PortalNetworkHiveCategory = "PORTAL NETWORK FOR HIVE TEST"
+	EthCategory           = "ETHEREUM"
+	BeaconCategory        = "BEACON CHAIN"
+	DevCategory           = "DEVELOPER CHAIN"
+	StateCategory         = "STATE HISTORY MANAGEMENT"
+	TxPoolCategory        = "TRANSACTION POOL (EVM)"
+	BlobPoolCategory      = "TRANSACTION POOL (BLOB)"
+	PerfCategory          = "PERFORMANCE TUNING"
+	AccountCategory       = "ACCOUNT"
+	APICategory           = "API AND CONSOLE"
+	NetworkingCategory    = "NETWORKING"
+	MinerCategory         = "MINER"
+	GasPriceCategory      = "GAS PRICE ORACLE"
+	VMCategory            = "VIRTUAL MACHINE"
+	LoggingCategory       = "LOGGING AND DEBUGGING"
+	MetricsCategory       = "METRICS AND STATS"
+	MiscCategory          = "MISC"
+	TestingCategory       = "TESTING"
+	DeprecatedCategory    = "ALIASED (deprecated)"
+	PortalNetworkCategory = "PORTAL NETWORK"
 )
 
 func init() {