Skip to content
This repository has been archived by the owner on Oct 4, 2019. It is now read-only.

Commit

Permalink
code cleanliness
Browse files Browse the repository at this point in the history
  • Loading branch information
@whilei
whilei committed Jun 4, 2018
1 parent a563be9 commit 2747947
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 27 deletions.
1 change: 0 additions & 1 deletion eth/downloader/statesync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@ func (s *stateSync) updateStats(written, duplicate, unexpected int, duration tim
s.d.syncStatsState.duplicate += uint64(duplicate)
s.d.syncStatsState.unexpected += uint64(unexpected)

// TODO(whilei): event it
if written > 0 || duplicate > 0 || unexpected > 0 {
glog.V(logger.Debug).Infoln("Imported new state entries", "count", written, "elapsed", duration.String(), "processed", s.d.syncStatsState.processed, "pending", s.d.syncStatsState.pending, "retry", len(s.tasks), "duplicate", s.d.syncStatsState.duplicate, "unexpected", s.d.syncStatsState.unexpected)
}
Expand Down
2 changes: 1 addition & 1 deletion logger/glog/glog.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ var severityColor = []string{"\x1b[2m", "\x1b[33m", "\x1b[31m", "\x1b[35m"} // i
var severityName = []string{
infoLog: "INFO",
warningLog: "WARN",
errorLog: "ERR-",
errorLog: "ERR ",
fatalLog: "FAIL",
}

Expand Down
2 changes: 1 addition & 1 deletion logger/glog/glog_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ func TestErrorDisplay(t *testing.T) {
display.verbosity.Set("3")
defer display.verbosity.Set("0")
D(2).Errorln("test")
if !displayContains(errorLog, "ERR-", t) {
if !displayContains(errorLog, "ERR ", t) {
t.Errorf("Error has wrong character: %q", displayContents(errorLog))
}
if !displayContains(warningLog, "test", t) {
Expand Down
20 changes: 10 additions & 10 deletions p2p/discover/udp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ var (
Ipv4ReservedRangePrivateNetwork = [2]net.IP{net.ParseIP("10.0.0.0"), net.ParseIP("10.255.255.255")}
ipv4ReservedRangeProviderSubscriber = [2]net.IP{net.ParseIP("100.64.0.0"), net.ParseIP("100.127.255.255")}
Ipv4ReservedRangeLoopback = [2]net.IP{net.ParseIP("127.0.0.0"), net.ParseIP("127.255.255.255")}
ipv4ReservedRangeLinkLocal = [2]net.IP{net.ParseIP("169.254.0.0"), net.ParseIP("169.254.255.255")}
ipv4ReservedRangeLocalPrivate1 = [2]net.IP{net.ParseIP("172.16.0.0"), net.ParseIP("172.31.255.255")}
ipv4ReservedRangeSpecialPurpose = [2]net.IP{net.ParseIP("192.0.0.0"), net.ParseIP("192.0.0.255")}
ipv4ReservedRangeTestNet1 = [2]net.IP{net.ParseIP("192.0.2.0"), net.ParseIP("192.0.2.255")}
ipv4ReservedRange6to4 = [2]net.IP{net.ParseIP("192.88.99.0"), net.ParseIP("192.88.99.255")}
Ipv4ReservedRangeLocalPrivate2 = [2]net.IP{net.ParseIP("192.168.0.0"), net.ParseIP("192.168.255.255")}
ipv4ReservedRangeSubnets = [2]net.IP{net.ParseIP("198.18.0.0"), net.ParseIP("198.19.255.255")}
ipv4ReservedRangeTestNet2 = [2]net.IP{net.ParseIP("198.51.100.0"), net.ParseIP("198.51.100.255")}
ipv4ReservedRangeTestNet3 = [2]net.IP{net.ParseIP("203.0.113.0"), net.ParseIP("203.0.113.255")}
ipv4ReservedRangeMulticast = [2]net.IP{net.ParseIP("224.0.0.0"), net.ParseIP("239.255.255.255")}
ipv4ReservedRangeLinkLocal = [2]net.IP{net.ParseIP("169.254.0.0"), net.ParseIP("169.254.255.255")}
ipv4ReservedRangeLocalPrivate1 = [2]net.IP{net.ParseIP("172.16.0.0"), net.ParseIP("172.31.255.255")}
ipv4ReservedRangeSpecialPurpose = [2]net.IP{net.ParseIP("192.0.0.0"), net.ParseIP("192.0.0.255")}
ipv4ReservedRangeTestNet1 = [2]net.IP{net.ParseIP("192.0.2.0"), net.ParseIP("192.0.2.255")}
ipv4ReservedRange6to4 = [2]net.IP{net.ParseIP("192.88.99.0"), net.ParseIP("192.88.99.255")}
Ipv4ReservedRangeLocalPrivate2 = [2]net.IP{net.ParseIP("192.168.0.0"), net.ParseIP("192.168.255.255")}
ipv4ReservedRangeSubnets = [2]net.IP{net.ParseIP("198.18.0.0"), net.ParseIP("198.19.255.255")}
ipv4ReservedRangeTestNet2 = [2]net.IP{net.ParseIP("198.51.100.0"), net.ParseIP("198.51.100.255")}
ipv4ReservedRangeTestNet3 = [2]net.IP{net.ParseIP("203.0.113.0"), net.ParseIP("203.0.113.255")}
ipv4ReservedRangeMulticast = [2]net.IP{net.ParseIP("224.0.0.0"), net.ParseIP("239.255.255.255")}
ipv4ReservedRangeFuture = [2]net.IP{net.ParseIP("240.0.0.0"), net.ParseIP("255.255.255.254")}
ipv4ReservedRangeLimitedBroadcast = [2]net.IP{net.ParseIP("255.255.255.255"), net.ParseIP("255.255.255.255")}

Expand Down
15 changes: 1 addition & 14 deletions p2p/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ type peerOpFunc func(map[discover.NodeID]*Peer)

type peerDrop struct {
*Peer
// TODO(whilei)
//err error
//requested bool // true if signaled by the peer
}
Expand Down Expand Up @@ -579,20 +580,6 @@ func (srv *Server) protoHandshakeChecks(peers map[discover.NodeID]*Peer, inbound
return srv.encHandshakeChecks(peers, inboundCount, c)
}

//func (srv *Server) randomPeer(peers map[discover.NodeID]*Peer) *Peer {
// l := len(peers)
// if l != 0 {
// randomDropper := rand.Intn(l)
// c := 0
// for _, p := range peers {
// if c == randomDropper {
// return p
// }
// }
// }
// return nil
//}

func (srv *Server) encHandshakeChecks(peers map[discover.NodeID]*Peer, inboundCount int, c *conn) error {
switch {
case !c.is(trustedConn|staticDialedConn) && len(peers) >= srv.MaxPeers:
Expand Down

0 comments on commit 2747947

Please sign in to comment.