From 2e2f44b615e12ca13a40bb6c2bf1392ac3aa1f43 Mon Sep 17 00:00:00 2001
From: fearlseefe <505380967@qq.com>
Date: Wed, 17 Apr 2024 12:22:07 +0800
Subject: [PATCH] feat: remove unused file

---
 beacon/beacon.sqlite                | Bin 24576 -> 0 bytes
 cmd/shisui/main.go                  |  15 +++++++--------
 p2p/discover/portal_protocol.go     |   5 +++--
 p2p/discover/portalwire/messages.go |   6 +++---
 shisui.sqlite                       | Bin 12288 -> 0 bytes
 5 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 beacon/beacon.sqlite
 delete mode 100644 shisui.sqlite

diff --git a/beacon/beacon.sqlite b/beacon/beacon.sqlite
deleted file mode 100644
index 2acb638ac00e51e9b5bdeb95726b95a8d24db779..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24576
zcmeI&&u-H&9KdmB{l_A8ox~xOOMPrLgg_j3fEFS&5n3okVqBuM@uY~X8EuL-Zrzjc
z2;6uGUWg+}OtKUK;v9V~*>UV&-26WAB}(7Cc7j;RvuJhh#qyCj6ow(5NGXJ<C$*W>
zyrk!8&5MzD{&B2}`>QYQ&JWROe-oWMo$m)<4{j%23IYfqfB*srAb<b@2q1vK{|UTr
zG_9kaaTP3mb-B6ly;!;H;IncA|1w;-dZhVuY7b|&JQ+W;-^t&i<YX+1$bM;Zu)SMv
zS-qZdU5mYWsEVMX)A+USY&df4n?+>b+`mw(Ao7!6oY~LqseCm(c{!Y($`|(OJ#+t)
z7jBdsIg^nbPiAub)^U>2^&(oS;)>El>7Mdwb8uE`S;t*t+sHDXD{m1k-K55985aV2
zxW1GAUqVv`J=HI-GT1&aT2{AfTpwo$Iz+d7JL&7OH23`az?btdn(rnrladE~P**zQ
zCfV||X3CcMb3po_bCE*Q931U6t;bzMWHRfIVe($@dYd@P&Ru<<?n8a7CEM&)y4Big
zbC@<11Q0*~0R#|0009ILKmY**5U8qvnI^{je^nnZc_DxR0tg_000IagfB*srAdm_0
z{?A50009ILKmY**5I_I{1Q0-=`U3p_zxvOZ3=u#80R#|0009ILKmY**5a9bidjJ6h
V5I_I{1Q0*~0R#|00D<ZY`~<wO#mxW!

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 dd30b9242b14bde9d5dbff0085e177281c5d156e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI#y-LJD5Ww->C~5*nuDc@5mI^9}FJK}m#E2TNNfjcla9m6<w|8jioA^4uk)^vK
zsjv3<5A4Te*oFP2ny1HXVYGT}ySK`yOEDEviYujr5Ymo4JH~MN{+QU+<=aAv^X_{R
z{t7Q_MA(Es+YV4i009ILKmY**5I_I{1Q0;r{|glIa27@K%Qw|?t(TjXX}fXpuJbgW
zr)nN2S*nJbIu3k)sXtYc-6!fHzqyO^Lfxjtsr|mG>b34Gfq!!59n9iLibeCHKUVLx
z?dr>FZQ4FBhwI9VVdMJxBj-7B)6`7_0tg_000IagfB*srAb<b@2<)mr;2uW*zpKBO
YcOifP0tg_000IagfB*srAkYi^0Y45jrT_o{