p2p: access embedded fields of Server directly (ethereum#27078)

joohhnnn · web-flow · commit b1972627d9cf · 2023-04-18T11:57:08.000+02:00
diff --git a/p2p/server.go b/p2p/server.go
@@ -443,7 +443,7 @@ func (srv *Server) Start() (err error) {
 		return errors.New("server already running")
 	}
 	srv.running = true
-	srv.log = srv.Config.Logger
+	srv.log = srv.Logger
 	if srv.log == nil {
 		srv.log = log.Root()
 	}
@@ -501,7 +501,7 @@ func (srv *Server) setupLocalNode() error {
 	sort.Sort(capsByNameAndVersion(srv.ourHandshake.Caps))
 
 	// Create the local node.
-	db, err := enode.OpenDB(srv.Config.NodeDatabase)
+	db, err := enode.OpenDB(srv.NodeDatabase)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ func (srv *Server) Start() (err error) {`
`443`	`443`	`return errors.New("server already running")`
`444`	`444`	`}`
`445`	`445`	`srv.running = true`
`446`		`- srv.log = srv.Config.Logger`
	`446`	`+ srv.log = srv.Logger`
`447`	`447`	`if srv.log == nil {`
`448`	`448`	`srv.log = log.Root()`
`449`	`449`	`}`
`@@ -501,7 +501,7 @@ func (srv *Server) setupLocalNode() error {`
`501`	`501`	`sort.Sort(capsByNameAndVersion(srv.ourHandshake.Caps))`
`502`	`502`
`503`	`503`	`// Create the local node.`
`504`		`- db, err := enode.OpenDB(srv.Config.NodeDatabase)`
	`504`	`+ db, err := enode.OpenDB(srv.NodeDatabase)`
`505`	`505`	`if err != nil {`
`506`	`506`	`return err`
`507`	`507`	`}`