Skip to content

Commit

Permalink
feat: remove unused file
Browse files Browse the repository at this point in the history
  • Loading branch information
fearlessfe authored and GrapeBaBa committed Apr 17, 2024
1 parent 9c0a5cc commit 2e2f44b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
Binary file removed beacon/beacon.sqlite
Binary file not shown.
15 changes: 7 additions & 8 deletions cmd/shisui/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func shisui(ctx *cli.Context) error {
return nil
}

logger := setDefaultLogger(*config)
setDefaultLogger(*config)

addr, err := net.ResolveUDPAddr("udp", config.Protocol.ListenAddr)
if err != nil {
Expand All @@ -89,20 +89,19 @@ func shisui(ctx *cli.Context) error {
return err
}

return startPortalRpcServer(*config, conn, logger, config.RpcAddr)
return startPortalRpcServer(*config, conn, config.RpcAddr)
}

func setDefaultLogger(config Config) log.Logger {
func setDefaultLogger(config Config) {
glogger := log.NewGlogHandler(log.NewTerminalHandler(os.Stderr, true))
slogVerbosity := log.FromLegacyLevel(config.LogLevel)
glogger.Verbosity(slogVerbosity)
defaultLogger := log.NewLogger(glogger)
log.SetDefault(defaultLogger)
return defaultLogger
}

func startPortalRpcServer(config Config, conn discover.UDPConn, logger log.Logger, addr string) error {
discV5, localNode, err := initDiscV5(config, conn, logger)
func startPortalRpcServer(config Config, conn discover.UDPConn, addr string) error {
discV5, localNode, err := initDiscV5(config, conn)
if err != nil {
return err
}
Expand Down Expand Up @@ -136,12 +135,12 @@ func startPortalRpcServer(config Config, conn discover.UDPConn, logger log.Logge
return nil
}

func initDiscV5(config Config, conn discover.UDPConn, log log.Logger) (*discover.UDPv5, *enode.LocalNode, error) {
func initDiscV5(config Config, conn discover.UDPConn) (*discover.UDPv5, *enode.LocalNode, error) {
discCfg := discover.Config{
PrivateKey: config.PrivateKey,
NetRestrict: config.Protocol.NetRestrict,
Bootnodes: config.Protocol.BootstrapNodes,
Log: log,
Log: log.New("discV5"),
}

nodeDB, err := enode.OpenDB(config.Protocol.NodeDBPath)
Expand Down
5 changes: 3 additions & 2 deletions p2p/discover/portal_protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,12 @@ func defaultContentIdFunc(contentKey []byte) []byte {
func NewPortalProtocol(config *PortalProtocolConfig, protocolId string, privateKey *ecdsa.PrivateKey, conn UDPConn, localNode *enode.LocalNode, discV5 *UDPv5, storage storage.ContentStorage, contentQueue chan *ContentElement, opts ...PortalProtocolOption) (*PortalProtocol, error) {
closeCtx, cancelCloseCtx := context.WithCancel(context.Background())

protocolName := portalwire.NetworkNameMap[protocolId]
protocol := &PortalProtocol{
protocolId: protocolId,
protocolName: portalwire.NetworkNameMap[protocolId],
protocolName: protocolName,
ListenAddr: config.ListenAddr,
Log: log.New("protocol", protocolId),
Log: log.New("protocol", protocolName),
PrivateKey: privateKey,
NetRestrict: config.NetRestrict,
BootstrapNodes: config.BootstrapNodes,
Expand Down
6 changes: 3 additions & 3 deletions p2p/discover/portalwire/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ const (
)

var NetworkNameMap = map[string]string{
string(StateNetwork): StateNetworkName,
string(HistoryNetwork): HistoryNetworkName,
string(StateNetwork): StateNetworkName,
string(StateNetwork): StateNetworkName,
string(HistoryNetwork): HistoryNetworkName,
string(BeaconLightClientNetwork): BeaconNetworkName,
}

type ContentKV struct {
Expand Down
Binary file removed shisui.sqlite
Binary file not shown.

0 comments on commit 2e2f44b

Please sign in to comment.