diff --git a/beacon/beacon.sqlite b/beacon/beacon.sqlite deleted file mode 100644 index 2acb638ac0..0000000000 Binary files a/beacon/beacon.sqlite and /dev/null differ diff --git a/cmd/shisui/main.go b/cmd/shisui/main.go index 115ed60743..73e416e534 100644 --- a/cmd/shisui/main.go +++ b/cmd/shisui/main.go @@ -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 { @@ -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 } @@ -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) diff --git a/p2p/discover/portal_protocol.go b/p2p/discover/portal_protocol.go index e339fe4a09..61623fb96a 100644 --- a/p2p/discover/portal_protocol.go +++ b/p2p/discover/portal_protocol.go @@ -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, diff --git a/p2p/discover/portalwire/messages.go b/p2p/discover/portalwire/messages.go index 2449f9977e..54a553456e 100644 --- a/p2p/discover/portalwire/messages.go +++ b/p2p/discover/portalwire/messages.go @@ -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 { diff --git a/shisui.sqlite b/shisui.sqlite deleted file mode 100644 index dd30b9242b..0000000000 Binary files a/shisui.sqlite and /dev/null differ