diff --git a/cmd/shisui/config_test.go b/cmd/shisui/config_test.go index e22fac5dd5..cffe1eca20 100644 --- a/cmd/shisui/config_test.go +++ b/cmd/shisui/config_test.go @@ -9,15 +9,15 @@ import ( ) func TestGenConfig(t *testing.T) { - size := uint64(1000 * 1000) + size := uint64(5 * 1000 * 1000 * 1000) flagSet := flag.NewFlagSet("test", 0) - flagSet.String("history.http.addr", "127.0.0.11", "test") - flagSet.String("history.http.port", "8888", "test") - flagSet.String("history.data.dir", "./test", "test") - flagSet.Uint64("history.data.capacity", size, "test") + flagSet.String("rpc.addr", "127.0.0.11", "test") + flagSet.String("rpc.port", "8888", "test") + flagSet.String("data.dir", "./test", "test") + flagSet.Uint64("data.capacity", size, "test") flagSet.String("udp.addr", "172.23.50.11", "test") flagSet.Int("udp.port", 9999, "test") - flagSet.Int("history.loglevel", 3, "test") + flagSet.Int("loglevel", 3, "test") command := &cli.Command{Name: "mycommand"} diff --git a/cmd/shisui/main.go b/cmd/shisui/main.go index 501a7b7761..535b2e1f59 100644 --- a/cmd/shisui/main.go +++ b/cmd/shisui/main.go @@ -34,15 +34,15 @@ var app = flags.NewApp("the go-portal-network command line interface") var ( portalProtocolFlags = []cli.Flag{ - utils.ProtocolUDPListenAddrFlag, - utils.ProtocolUDPPortFlag, + utils.PortalUDPListenAddrFlag, + utils.PortalUDPPortFlag, } historyRpcFlags = []cli.Flag{ - utils.HistoryHTTPListenAddrFlag, - utils.HistoryHTTPPortFlag, - utils.HistoryDataDirFlag, - utils.HistoryDataCapacityFlag, - utils.LogLevelFlag, + utils.PortalRPCListenAddrFlag, + utils.PortalRPCPortFlag, + utils.PortalDataDirFlag, + utils.PortalDataCapacityFlag, + utils.PortalLogLevelFlag, } hiveTestFlags = []cli.Flag{ utils.HiveBootNodeFlag, @@ -118,21 +118,21 @@ func getPortalHistoryConfig(ctx *cli.Context) (*PortalHistoryConfig, error) { return config, err } - httpAddr := ctx.String(utils.HistoryHTTPListenAddrFlag.Name) - httpPort := ctx.String(utils.HistoryHTTPPortFlag.Name) + httpAddr := ctx.String(utils.PortalRPCListenAddrFlag.Name) + httpPort := ctx.String(utils.PortalRPCPortFlag.Name) config.RpcAddr = net.JoinHostPort(httpAddr, httpPort) - config.DataDir = ctx.String(utils.HistoryDataDirFlag.Name) - config.DataCapacity = ctx.Uint64(utils.HistoryDataCapacityFlag.Name) - config.LogLevel = ctx.Int(utils.LogLevelFlag.Name) - port := ctx.String(utils.ProtocolUDPPortFlag.Name) + config.DataDir = ctx.String(utils.PortalDataDirFlag.Name) + config.DataCapacity = ctx.Uint64(utils.PortalDataCapacityFlag.Name) + config.LogLevel = ctx.Int(utils.PortalLogLevelFlag.Name) + port := ctx.String(utils.PortalUDPPortFlag.Name) if !strings.HasPrefix(port, ":") { config.Protocol.ListenAddr = ":" + port } else { config.Protocol.ListenAddr = port } - if ctx.IsSet(utils.ProtocolUDPListenAddrFlag.Name) { - ip := ctx.String(utils.ProtocolUDPListenAddrFlag.Name) + if ctx.IsSet(utils.PortalUDPListenAddrFlag.Name) { + ip := ctx.String(utils.PortalUDPListenAddrFlag.Name) netIp := net.ParseIP(ip) if netIp == nil { return config, fmt.Errorf("invalid ip addr: %s", ip) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 92c4fc33c4..bac18c0ea1 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -945,50 +945,50 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server. Category: flags.MetricsCategory, } - HistoryHTTPListenAddrFlag = &cli.StringFlag{ - Name: "history.http.addr", + PortalRPCListenAddrFlag = &cli.StringFlag{ + Name: "rpc.addr", Usage: "HTTP-RPC server listening interface", Value: node.DefaultHTTPHost, Category: flags.PortalNetworkCategory, } - HistoryHTTPPortFlag = &cli.IntFlag{ - Name: "history.http.port", + PortalRPCPortFlag = &cli.IntFlag{ + Name: "rpc.port", Usage: "HTTP-RPC server listening port", Value: node.DefaultHTTPPort, Category: flags.PortalNetworkCategory, } - HistoryDataDirFlag = &cli.StringFlag{ - Name: "history.data.dir", + PortalDataDirFlag = &cli.StringFlag{ + Name: "data.dir", Usage: "data dir of where the data file located", Value: "./", Category: flags.PortalNetworkCategory, } - HistoryDataCapacityFlag = &cli.Uint64Flag{ - Name: "history.data.capacity", + PortalDataCapacityFlag = &cli.Uint64Flag{ + Name: "data.capacity", Usage: "the capacity of the data stored, the unit is byte", - Value: 1000 * 1000 * 1000, // 1 GB + Value: 1000 * 1000 * 1000 * 2, // 2 GB Category: flags.PortalNetworkCategory, } - ProtocolUDPListenAddrFlag = &cli.StringFlag{ + PortalUDPListenAddrFlag = &cli.StringFlag{ Name: "udp.addr", Usage: "protocol UDP server listening interface", Value: "", Category: flags.PortalNetworkCategory, } - ProtocolUDPPortFlag = &cli.IntFlag{ + PortalUDPPortFlag = &cli.IntFlag{ Name: "udp.port", Usage: "protocol UDP server listening port", Value: node.DefaultUDPPort, Category: flags.PortalNetworkCategory, } - LogLevelFlag = &cli.IntFlag{ - Name: "history.loglevel", + PortalLogLevelFlag = &cli.IntFlag{ + Name: "loglevel", Usage: "loglevel of portal network", Value: node.DetaultLoglevel, Category: flags.PortalNetworkCategory,