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

feat: remove unused file

Browse source
This commit is contained in:
fearlseefe 2024-04-17 12:22:07 +08:00 committed by Chen Kai
parent 9c0a5ccb74
commit 2e2f44b615
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
beacon/beacon.sqlite
View file

Binary file not shown.

15
cmd/shisui/main.go
View file

@ -78,7 +78,7 @@ func shisui(ctx *cli.Context) error {
return nil return nil
} }
logger := setDefaultLogger(*config) setDefaultLogger(*config)
addr, err := net.ResolveUDPAddr("udp", config.Protocol.ListenAddr) addr, err := net.ResolveUDPAddr("udp", config.Protocol.ListenAddr)
if err != nil { if err != nil {
@ -89,20 +89,19 @@ func shisui(ctx *cli.Context) error {
return err 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)) glogger := log.NewGlogHandler(log.NewTerminalHandler(os.Stderr, true))
slogVerbosity := log.FromLegacyLevel(config.LogLevel) slogVerbosity := log.FromLegacyLevel(config.LogLevel)
glogger.Verbosity(slogVerbosity) glogger.Verbosity(slogVerbosity)
defaultLogger := log.NewLogger(glogger) defaultLogger := log.NewLogger(glogger)
log.SetDefault(defaultLogger) log.SetDefault(defaultLogger)
return defaultLogger
} }
func startPortalRpcServer(config Config, conn discover.UDPConn, logger log.Logger, addr string) error { func startPortalRpcServer(config Config, conn discover.UDPConn, addr string) error {
discV5, localNode, err := initDiscV5(config, conn, logger) discV5, localNode, err := initDiscV5(config, conn)
if err != nil { if err != nil {
return err return err
} }
@ -136,12 +135,12 @@ func startPortalRpcServer(config Config, conn discover.UDPConn, logger log.Logge
return nil 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{ discCfg := discover.Config{
PrivateKey: config.PrivateKey, PrivateKey: config.PrivateKey,
NetRestrict: config.Protocol.NetRestrict, NetRestrict: config.Protocol.NetRestrict,
Bootnodes: config.Protocol.BootstrapNodes, Bootnodes: config.Protocol.BootstrapNodes,
Log: log, Log: log.New("discV5"),
} }
nodeDB, err := enode.OpenDB(config.Protocol.NodeDBPath) nodeDB, err := enode.OpenDB(config.Protocol.NodeDBPath)

5
p2p/discover/portal_protocol.go
View file

@ -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) { 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()) closeCtx, cancelCloseCtx := context.WithCancel(context.Background())
protocolName := portalwire.NetworkNameMap[protocolId]
protocol := &PortalProtocol{ protocol := &PortalProtocol{
protocolId: protocolId, protocolId: protocolId,
protocolName: portalwire.NetworkNameMap[protocolId], protocolName: protocolName,
ListenAddr: config.ListenAddr, ListenAddr: config.ListenAddr,
Log: log.New("protocol", protocolId), Log: log.New("protocol", protocolName),
PrivateKey: privateKey, PrivateKey: privateKey,
NetRestrict: config.NetRestrict, NetRestrict: config.NetRestrict,
BootstrapNodes: config.BootstrapNodes, BootstrapNodes: config.BootstrapNodes,

6
p2p/discover/portalwire/messages.go
View file

@ -55,9 +55,9 @@ const (
) )
var NetworkNameMap = map[string]string{ var NetworkNameMap = map[string]string{
string(StateNetwork): StateNetworkName, string(StateNetwork): StateNetworkName,
string(HistoryNetwork): HistoryNetworkName, string(HistoryNetwork): HistoryNetworkName,
string(StateNetwork): StateNetworkName, string(BeaconLightClientNetwork): BeaconNetworkName,
} }
type ContentKV struct { type ContentKV struct {

BIN
shisui.sqlite
View file

Binary file not shown.