cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

p2p: remove "cap" enr entry (#19800)

Browse Source 
This entry was an experiment, but we're moving on to the
entry-per-protocol instead.
This commit is contained in:
Felix Lange 2019-07-08 17:41:41 +02:00 committed by Péter Szilágyi
parent 22060611fb
commit cc0f0e27a6
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
p2p/protocol.go
View File

@ -79,5 +79,3 @@ func (cs capsByNameAndVersion) Swap(i, j int) { cs[i], cs[j] = cs[j], cs[i] }
func (cs capsByNameAndVersion) Less(i, j int) bool { func (cs capsByNameAndVersion) Less(i, j int) bool {
return cs[i].Name < cs[j].Name || (cs[i].Name == cs[j].Name && cs[i].Version < cs[j].Version) return cs[i].Name < cs[j].Name || (cs[i].Name == cs[j].Name && cs[i].Version < cs[j].Version)
} }
func (capsByNameAndVersion) ENRKey() string { return "cap" }

1
p2p/server.go
View File

@ -488,7 +488,6 @@ func (srv *Server) setupLocalNode() error {
srv.nodedb = db srv.nodedb = db
srv.localnode = enode.NewLocalNode(db, srv.PrivateKey) srv.localnode = enode.NewLocalNode(db, srv.PrivateKey)
srv.localnode.SetFallbackIP(net.IP{127, 0, 0, 1}) srv.localnode.SetFallbackIP(net.IP{127, 0, 0, 1})
srv.localnode.Set(capsByNameAndVersion(srv.ourHandshake.Caps))
// TODO: check conflicts // TODO: check conflicts
for _, p := range srv.Protocols { for _, p := range srv.Protocols {
for _, e := range p.Attributes { for _, e := range p.Attributes {