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

whisper: minor fixes

Browse source
This commit is contained in:
Vlad 2017-12-20 15:01:50 +02:00
parent c6f32a8c60
commit 04353a80f3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
whisper/whisperv6/peer_test.go
View file

@ -334,7 +334,7 @@ func TestPeerBasic(t *testing.T) {
func powReqExchange(t *testing.T) { func powReqExchange(t *testing.T) {
for i, node := range nodes { for i, node := range nodes {
for peer, _ := range node.shh.peers { for peer := range node.shh.peers {
if peer.powRequirement > 1000.0 { if peer.powRequirement > 1000.0 {
t.Fatalf("node %d: one of the peers' pow requirement is too big (%f).", i, peer.powRequirement) t.Fatalf("node %d: one of the peers' pow requirement is too big (%f).", i, peer.powRequirement)
} }
@ -349,7 +349,7 @@ func powReqExchange(t *testing.T) {
cnt := 0 cnt := 0
for i, node := range nodes { for i, node := range nodes {
for peer, _ := range node.shh.peers { for peer := range node.shh.peers {
if peer.peer.ID() == discover.PubkeyID(&nodes[0].id.PublicKey) { if peer.peer.ID() == discover.PubkeyID(&nodes[0].id.PublicKey) {
cnt++ cnt++
if peer.powRequirement != pow { if peer.powRequirement != pow {

8
whisper/whisperv6/whisper.go
View file

@ -192,7 +192,7 @@ func (w *Whisper) SetMinimumPoW(val float64, testMode bool) error {
w.settings.Store(minPowIdx, val) w.settings.Store(minPowIdx, val)
} else { } else {
go func() { go func() {
// // allow some time before all the peers have processed the notification // allow some time before all the peers have processed the notification
time.Sleep(time.Duration(w.reactionAllowance) * time.Second) time.Sleep(time.Duration(w.reactionAllowance) * time.Second)
w.settings.Store(minPowIdx, val) w.settings.Store(minPowIdx, val)
}() }()
@ -211,7 +211,7 @@ func (w *Whisper) notifyPeersAboutPowRequirementChange(pow float64) {
err = p.notifyAboutPowRequirementChange(pow) err = p.notifyAboutPowRequirementChange(pow)
} }
if err != nil { if err != nil {
fmt.Errorf("Error sending PoW notification to peer [%x]: %s", p.ID(), err) log.Warn("oversized message received", "peer", p.ID(), "error", err)
} }
} }
} }
@ -568,7 +568,7 @@ func (wh *Whisper) runMessageLoop(p *Peer, rw p2p.MsgReadWriter) error {
return errors.New("invalid powRequirementCode message") return errors.New("invalid powRequirementCode message")
} }
f := math.Float64frombits(i) f := math.Float64frombits(i)
if math.IsInf(f, 0) || math.IsNaN(f) { if math.IsInf(f, 0) || math.IsNaN(f) || f < 0.0 {
log.Warn("invalid value in powRequirementCode message, peer will be disconnected", "peer", p.peer.ID(), "err", err) log.Warn("invalid value in powRequirementCode message, peer will be disconnected", "peer", p.peer.ID(), "err", err)
return errors.New("invalid value in powRequirementCode message") return errors.New("invalid value in powRequirementCode message")
} }
@ -640,7 +640,7 @@ func (wh *Whisper) add(envelope *Envelope) (bool, error) {
log.Debug("envelope with low PoW dropped", "PoW", envelope.PoW(), "hash", envelope.Hash().Hex()) log.Debug("envelope with low PoW dropped", "PoW", envelope.PoW(), "hash", envelope.Hash().Hex())
return false, nil // drop envelope without error for now return false, nil // drop envelope without error for now
// after the Status message will include the PoW requirement, it should return an error here: // once the status message includes the PoW requirement, an error should be returned here:
//return false, fmt.Errorf("envelope with low PoW dropped: PoW=%f, hash=[%v]", envelope.PoW(), envelope.Hash().Hex()) //return false, fmt.Errorf("envelope with low PoW dropped: PoW=%f, hash=[%v]", envelope.PoW(), envelope.Hash().Hex())
} }