Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Validate For Metadata #5348

Merged
merged 3 commits into from
Apr 8, 2020
Merged

Fix Validate For Metadata #5348

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6e2934
return true
nisdas Apr 8, 2020
41f89ea
shay's review
nisdas Apr 8, 2020
626fb4f
Merge refs/heads/v0.11 into fixValidate
prylabs-bulldozer[bot] Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions beacon-chain/sync/rpc_ping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ func (r *Service) pingHandler(ctx context.Context, msg interface{}, stream libp2
if !ok {
return fmt.Errorf("wrong message type for ping, got %T, wanted *uint64", msg)
}
changed, err := r.validateSequenceNum(*m, stream.Conn().RemotePeer())
valid, err := r.validateSequenceNum(*m, stream.Conn().RemotePeer())
if err != nil {
return err
}
if changed {
if !valid {
// send metadata request in a new routine and stream.
go func() {
md, err := r.sendMetaDataRequest(ctx, stream.Conn().RemotePeer())
Expand Down Expand Up @@ -69,12 +69,12 @@ func (r *Service) sendPingRequest(ctx context.Context, id peer.ID) error {
r.p2p.Peers().IncrementBadResponses(stream.Conn().RemotePeer())
return err
}
changed, err := r.validateSequenceNum(*msg, stream.Conn().RemotePeer())
valid, err := r.validateSequenceNum(*msg, stream.Conn().RemotePeer())
if err != nil {
r.p2p.Peers().IncrementBadResponses(stream.Conn().RemotePeer())
return err
}
if !changed {
if valid {
return nil
}
md, err := r.sendMetaDataRequest(ctx, stream.Conn().RemotePeer())
Expand All @@ -97,7 +97,7 @@ func (r *Service) validateSequenceNum(seq uint64, id peer.ID) (bool, error) {
return false, nil
}
if md.SeqNumber != seq {
return true, nil
return false, nil
}
return false, nil
return true, nil
}