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

p2p: dial using node iterator #20132

Merged
merged 17 commits into from
Oct 29, 2019
Merged

p2p: dial using node iterator #20132

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
79c6762
p2p/enode: add Iterator and associated utilities
fjl Jul 5, 2019
c1f6136
p2p/discover: add RandomNodes iterator
fjl Jul 5, 2019
52a1841
cmd/devp2p: add discv4 crawler
fjl Jul 5, 2019
83e2b85
p2p: dial using iterator
fjl Jul 5, 2019
bed0370
cmd/devp2p: WIP nodeset filter
fjl Oct 6, 2019
4ca202d
cmd/devp2p: fixup lesFilter
fjl Oct 8, 2019
d9f697c
core/forkid: add NewStaticFilter
fjl Oct 17, 2019
00d0561
cmd/devp2p: make -eth-network filter actually work
fjl Oct 17, 2019
1098aef
cmd/devp2p: improve crawl timestamp handling
fjl Oct 18, 2019
d85ee4d
cmd/devp2p: fix typo
fjl Oct 18, 2019
497220e
p2p/enode: fix comment typos
fjl Oct 18, 2019
d487c42
p2p/discover: fix comment typos
fjl Oct 18, 2019
6152336
p2p/discover: rename lookup.next to 'advance'
fjl Oct 29, 2019
70360e2
p2p: lower discovery mixer timeout
fjl Oct 29, 2019
4387dcd
p2p/enode: implement dynamic FairMix timeouts
fjl Oct 29, 2019
86b9e47
cmd/devp2p: add ropsten support in -eth-network filter
fjl Oct 29, 2019
49b49fc
cmd/devp2p: tweak crawler log message
fjl Oct 29, 2019
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
Prev Previous commit
Next Next commit
p2p/discover: rename lookup.next to 'advance'
  • Loading branch information
@fjl
fjl committed Oct 29, 2019
commit 61523364ddc17b49c6e4b29c22e62dad1a2a554c
8 changes: 4 additions & 4 deletions p2p/discover/lookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ func newLookup(ctx context.Context, tab *Table, target enode.ID, q queryFunc) *l

// run runs the lookup to completion and returns the closest nodes found.
func (it *lookup) run() []*enode.Node {
for it.next() {
for it.advance() {
}
return unwrapNodes(it.result.entries)
}

// next advances the lookup until any new nodes have been found.
// advance advances the lookup until any new nodes have been found.
// It returns false when the lookup has ended.
fjl marked this conversation as resolved.
Show resolved Hide resolved
func (it *lookup) next() bool {
func (it *lookup) advance() bool {
for it.startQueries() {
select {
case nodes := <-it.replyCh:
Expand Down Expand Up @@ -194,7 +194,7 @@ func (it *lookupIterator) Next() bool {
it.lookup = it.nextLookup(it.ctx)
continue
}
if !it.lookup.next() {
if !it.lookup.advance() {
it.lookup = nil
continue
}
Expand Down