forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/pss: Complete depth/po comparison + proper loglevel ctrl

Browse source
This commit is contained in:
lash 2018-11-23 09:55:40 +01:00
parent 8b7918ba1c
commit 91b45cc965
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
swarm/pss/pss.go
View file

@ -514,10 +514,7 @@ func (p *Pss) isSelfPossibleRecipient(msg *PssMsg, prox bool) bool {
po, _ := p.Kademlia.Pof(p.Kademlia.BaseAddr(), msg.To, 0) po, _ := p.Kademlia.Pof(p.Kademlia.BaseAddr(), msg.To, 0)
log.Trace("selfpossible", "po", po, "depth", depth) log.Trace("selfpossible", "po", po, "depth", depth)
if po <= depth { return depth <= po
return true
}
return false
} }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////

12
swarm/pss/pss_test.go
View file

@ -55,8 +55,7 @@ import (
var ( var (
initOnce = sync.Once{} initOnce = sync.Once{}
debugdebugflag = flag.Bool("vv", false, "veryverbose") loglevel = flag.Int("loglevel", 2, "logging verbosity")
debugflag = flag.Bool("v", false, "verbose")
longrunning = flag.Bool("longrunning", false, "do run long-running tests") longrunning = flag.Bool("longrunning", false, "do run long-running tests")
w *whisper.Whisper w *whisper.Whisper
wapi *whisper.PublicWhisperAPI wapi *whisper.PublicWhisperAPI
@ -79,16 +78,9 @@ func init() {
func initTest() { func initTest() {
initOnce.Do( initOnce.Do(
func() { func() {
loglevel := log.LvlInfo
if *debugflag {
loglevel = log.LvlDebug
} else if *debugdebugflag {
loglevel = log.LvlTrace
}
psslogmain = log.New("psslog", "*") psslogmain = log.New("psslog", "*")
hs := log.StreamHandler(os.Stderr, log.TerminalFormat(true)) hs := log.StreamHandler(os.Stderr, log.TerminalFormat(true))
hf := log.LvlFilterHandler(loglevel, hs) hf := log.LvlFilterHandler(log.Lvl(*loglevel), hs)
h := log.CallerFileHandler(hf) h := log.CallerFileHandler(hf)
log.Root().SetHandler(h) log.Root().SetHandler(h)