forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-16 08:53:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: remove flags for hive test

Browse source
This commit is contained in:
fearlessfe 2024-03-17 22:33:02 +08:00 committed by Chen Kai
parent afeaa102b4
commit 0b6714dea0
3 changed files with 38 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmd/shisui/main.go
View file

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

22
cmd/utils/flags.go
View file

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

1
internal/flags/categories.go
View file

@ -38,7 +38,6 @@ const (
TestingCategory = "TESTING" TestingCategory = "TESTING"
DeprecatedCategory = "ALIASED (deprecated)" DeprecatedCategory = "ALIASED (deprecated)"
PortalNetworkCategory = "PORTAL NETWORK" PortalNetworkCategory = "PORTAL NETWORK"
PortalNetworkHiveCategory = "PORTAL NETWORK FOR HIVE TEST"
) )
func init() { func init() {