2018-09-13 12:42:19 +03:00
|
|
|
// Copyright 2018 The go-ethereum Authors
|
|
|
|
// This file is part of the go-ethereum library.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
package network
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"sync"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
2018-09-13 12:42:19 +03:00
|
|
|
)
|
|
|
|
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
var requestedPeerID = enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8")
|
|
|
|
var sourcePeerID = enode.HexID("99d8594b52298567d2ca3f4c441a5ba0140ee9245e26460d01102a52773c73b9")
|
2018-09-13 12:42:19 +03:00
|
|
|
|
|
|
|
// mockRequester pushes every request to the requestC channel when its doRequest function is called
|
|
|
|
type mockRequester struct {
|
|
|
|
// requests []Request
|
|
|
|
requestC chan *Request // when a request is coming it is pushed to requestC
|
|
|
|
waitTimes []time.Duration // with waitTimes[i] you can define how much to wait on the ith request (optional)
|
|
|
|
ctr int //counts the number of requests
|
|
|
|
quitC chan struct{}
|
|
|
|
}
|
|
|
|
|
|
|
|
func newMockRequester(waitTimes ...time.Duration) *mockRequester {
|
|
|
|
return &mockRequester{
|
|
|
|
requestC: make(chan *Request),
|
|
|
|
waitTimes: waitTimes,
|
|
|
|
quitC: make(chan struct{}),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
func (m *mockRequester) doRequest(ctx context.Context, request *Request) (*enode.ID, chan struct{}, error) {
|
2018-09-13 12:42:19 +03:00
|
|
|
waitTime := time.Duration(0)
|
|
|
|
if m.ctr < len(m.waitTimes) {
|
|
|
|
waitTime = m.waitTimes[m.ctr]
|
|
|
|
m.ctr++
|
|
|
|
}
|
|
|
|
time.Sleep(waitTime)
|
|
|
|
m.requestC <- request
|
|
|
|
|
|
|
|
// if there is a Source in the request use that, if not use the global requestedPeerId
|
|
|
|
source := request.Source
|
|
|
|
if source == nil {
|
|
|
|
source = &requestedPeerID
|
|
|
|
}
|
|
|
|
return source, m.quitC, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestFetcherSingleRequest creates a Fetcher using mockRequester, and run it with a sample set of peers to skip.
|
|
|
|
// mockRequester pushes a Request on a channel every time the request function is called. Using
|
|
|
|
// this channel we test if calling Fetcher.Request calls the request function, and whether it uses
|
|
|
|
// the correct peers to skip which we provided for the fetcher.run function.
|
|
|
|
func TestFetcherSingleRequest(t *testing.T) {
|
|
|
|
requester := newMockRequester()
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcher := NewFetcher(addr, requester.doRequest, true)
|
|
|
|
|
|
|
|
peers := []string{"a", "b", "c", "d"}
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
for _, p := range peers {
|
|
|
|
peersToSkip.Store(p, time.Now())
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
go fetcher.run(ctx, peersToSkip)
|
|
|
|
|
|
|
|
rctx := context.Background()
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
select {
|
|
|
|
case request := <-requester.requestC:
|
|
|
|
// request should contain all peers from peersToSkip provided to the fetcher
|
|
|
|
for _, p := range peers {
|
|
|
|
if _, ok := request.peersToSkip.Load(p); !ok {
|
|
|
|
t.Fatalf("request.peersToSkip misses peer")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// source peer should be also added to peersToSkip eventually
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
if _, ok := request.peersToSkip.Load(requestedPeerID.String()); !ok {
|
|
|
|
t.Fatalf("request.peersToSkip does not contain peer returned by the request function")
|
|
|
|
}
|
|
|
|
|
|
|
|
// fetch should trigger a request, if it doesn't happen in time, test should fail
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("fetch timeout")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestCancelStopsFetcher tests that a cancelled fetcher does not initiate further requests even if its fetch function is called
|
|
|
|
func TestFetcherCancelStopsFetcher(t *testing.T) {
|
|
|
|
requester := newMockRequester()
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcher := NewFetcher(addr, requester.doRequest, true)
|
|
|
|
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
|
|
|
|
// we start the fetcher, and then we immediately cancel the context
|
|
|
|
go fetcher.run(ctx, peersToSkip)
|
|
|
|
cancel()
|
|
|
|
|
|
|
|
rctx, rcancel := context.WithTimeout(ctx, 100*time.Millisecond)
|
|
|
|
defer rcancel()
|
|
|
|
// we call Request with an active context
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
// fetcher should not initiate request, we can only check by waiting a bit and making sure no request is happening
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
t.Fatalf("cancelled fetcher initiated request")
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestFetchCancelStopsRequest tests that calling a Request function with a cancelled context does not initiate a request
|
|
|
|
func TestFetcherCancelStopsRequest(t *testing.T) {
|
|
|
|
requester := newMockRequester(100 * time.Millisecond)
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcher := NewFetcher(addr, requester.doRequest, true)
|
|
|
|
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
// we start the fetcher with an active context
|
|
|
|
go fetcher.run(ctx, peersToSkip)
|
|
|
|
|
|
|
|
rctx, rcancel := context.WithCancel(context.Background())
|
|
|
|
rcancel()
|
|
|
|
|
|
|
|
// we call Request with a cancelled context
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
// fetcher should not initiate request, we can only check by waiting a bit and making sure no request is happening
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
t.Fatalf("cancelled fetch function initiated request")
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
}
|
|
|
|
|
|
|
|
// if there is another Request with active context, there should be a request, because the fetcher itself is not cancelled
|
|
|
|
rctx = context.Background()
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("expected request")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestOfferUsesSource tests Fetcher Offer behavior.
|
|
|
|
// In this case there should be 1 (and only one) request initiated from the source peer, and the
|
|
|
|
// source nodeid should appear in the peersToSkip map.
|
|
|
|
func TestFetcherOfferUsesSource(t *testing.T) {
|
|
|
|
requester := newMockRequester(100 * time.Millisecond)
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcher := NewFetcher(addr, requester.doRequest, true)
|
|
|
|
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
// start the fetcher
|
|
|
|
go fetcher.run(ctx, peersToSkip)
|
|
|
|
|
|
|
|
rctx := context.Background()
|
|
|
|
// call the Offer function with the source peer
|
|
|
|
fetcher.Offer(rctx, &sourcePeerID)
|
|
|
|
|
|
|
|
// fetcher should not initiate request
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
t.Fatalf("fetcher initiated request")
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
}
|
|
|
|
|
|
|
|
// call Request after the Offer
|
|
|
|
rctx = context.Background()
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
// there should be exactly 1 request coming from fetcher
|
|
|
|
var request *Request
|
|
|
|
select {
|
|
|
|
case request = <-requester.requestC:
|
|
|
|
if *request.Source != sourcePeerID {
|
|
|
|
t.Fatalf("Expected source id %v got %v", sourcePeerID, request.Source)
|
|
|
|
}
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("fetcher did not initiate request")
|
|
|
|
}
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
t.Fatalf("Fetcher number of requests expected 1 got 2")
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
}
|
|
|
|
|
|
|
|
// source peer should be added to peersToSkip eventually
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
if _, ok := request.peersToSkip.Load(sourcePeerID.String()); !ok {
|
|
|
|
t.Fatalf("SourcePeerId not added to peersToSkip")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFetcherOfferAfterRequestUsesSourceFromContext(t *testing.T) {
|
|
|
|
requester := newMockRequester(100 * time.Millisecond)
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcher := NewFetcher(addr, requester.doRequest, true)
|
|
|
|
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
// start the fetcher
|
|
|
|
go fetcher.run(ctx, peersToSkip)
|
|
|
|
|
|
|
|
// call Request first
|
|
|
|
rctx := context.Background()
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
// there should be a request coming from fetcher
|
|
|
|
var request *Request
|
|
|
|
select {
|
|
|
|
case request = <-requester.requestC:
|
|
|
|
if request.Source != nil {
|
|
|
|
t.Fatalf("Incorrect source peer id, expected nil got %v", request.Source)
|
|
|
|
}
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("fetcher did not initiate request")
|
|
|
|
}
|
|
|
|
|
|
|
|
// after the Request call Offer
|
|
|
|
fetcher.Offer(context.Background(), &sourcePeerID)
|
|
|
|
|
|
|
|
// there should be a request coming from fetcher
|
|
|
|
select {
|
|
|
|
case request = <-requester.requestC:
|
|
|
|
if *request.Source != sourcePeerID {
|
|
|
|
t.Fatalf("Incorrect source peer id, expected %v got %v", sourcePeerID, request.Source)
|
|
|
|
}
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("fetcher did not initiate request")
|
|
|
|
}
|
|
|
|
|
|
|
|
// source peer should be added to peersToSkip eventually
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
if _, ok := request.peersToSkip.Load(sourcePeerID.String()); !ok {
|
|
|
|
t.Fatalf("SourcePeerId not added to peersToSkip")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestFetcherRetryOnTimeout tests that fetch retries after searchTimeOut has passed
|
|
|
|
func TestFetcherRetryOnTimeout(t *testing.T) {
|
|
|
|
requester := newMockRequester()
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcher := NewFetcher(addr, requester.doRequest, true)
|
|
|
|
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
|
|
|
|
// set searchTimeOut to low value so the test is quicker
|
|
|
|
defer func(t time.Duration) {
|
|
|
|
searchTimeout = t
|
|
|
|
}(searchTimeout)
|
|
|
|
searchTimeout = 250 * time.Millisecond
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
// start the fetcher
|
|
|
|
go fetcher.run(ctx, peersToSkip)
|
|
|
|
|
|
|
|
// call the fetch function with an active context
|
|
|
|
rctx := context.Background()
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
// after 100ms the first request should be initiated
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
default:
|
|
|
|
t.Fatalf("fetch did not initiate request")
|
|
|
|
}
|
|
|
|
|
|
|
|
// after another 100ms no new request should be initiated, because search timeout is 250ms
|
|
|
|
time.Sleep(100 * time.Millisecond)
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
t.Fatalf("unexpected request from fetcher")
|
|
|
|
default:
|
|
|
|
}
|
|
|
|
|
|
|
|
// after another 300ms search timeout is over, there should be a new request
|
|
|
|
time.Sleep(300 * time.Millisecond)
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
default:
|
|
|
|
t.Fatalf("fetch did not retry request")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestFetcherFactory creates a FetcherFactory and checks if the factory really creates and starts
|
|
|
|
// a Fetcher when it return a fetch function. We test the fetching functionality just by checking if
|
|
|
|
// a request is initiated when the fetch function is called
|
|
|
|
func TestFetcherFactory(t *testing.T) {
|
|
|
|
requester := newMockRequester(100 * time.Millisecond)
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcherFactory := NewFetcherFactory(requester.doRequest, false)
|
|
|
|
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
|
|
|
|
fetcher := fetcherFactory.New(context.Background(), addr, peersToSkip)
|
|
|
|
|
|
|
|
fetcher.Request(context.Background())
|
|
|
|
|
|
|
|
// check if the created fetchFunction really starts a fetcher and initiates a request
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("fetch timeout")
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFetcherRequestQuitRetriesRequest(t *testing.T) {
|
|
|
|
requester := newMockRequester()
|
|
|
|
addr := make([]byte, 32)
|
|
|
|
fetcher := NewFetcher(addr, requester.doRequest, true)
|
|
|
|
|
|
|
|
// make sure searchTimeout is long so it is sure the request is not retried because of timeout
|
|
|
|
defer func(t time.Duration) {
|
|
|
|
searchTimeout = t
|
|
|
|
}(searchTimeout)
|
|
|
|
searchTimeout = 10 * time.Second
|
|
|
|
|
|
|
|
peersToSkip := &sync.Map{}
|
|
|
|
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
go fetcher.run(ctx, peersToSkip)
|
|
|
|
|
|
|
|
rctx := context.Background()
|
|
|
|
fetcher.Request(rctx)
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("request is not initiated")
|
|
|
|
}
|
|
|
|
|
|
|
|
close(requester.quitC)
|
|
|
|
|
|
|
|
select {
|
|
|
|
case <-requester.requestC:
|
|
|
|
case <-time.After(200 * time.Millisecond):
|
|
|
|
t.Fatalf("request is not initiated after failed request")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestRequestSkipPeer checks if PeerSkip function will skip provided peer
|
|
|
|
// and not skip unknown one.
|
|
|
|
func TestRequestSkipPeer(t *testing.T) {
|
|
|
|
addr := make([]byte, 32)
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
peers := []enode.ID{
|
|
|
|
enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8"),
|
|
|
|
enode.HexID("99d8594b52298567d2ca3f4c441a5ba0140ee9245e26460d01102a52773c73b9"),
|
2018-09-13 12:42:19 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
peersToSkip := new(sync.Map)
|
|
|
|
peersToSkip.Store(peers[0].String(), time.Now())
|
|
|
|
r := NewRequest(addr, false, peersToSkip)
|
|
|
|
|
|
|
|
if !r.SkipPeer(peers[0].String()) {
|
|
|
|
t.Errorf("peer not skipped")
|
|
|
|
}
|
|
|
|
|
|
|
|
if r.SkipPeer(peers[1].String()) {
|
|
|
|
t.Errorf("peer skipped")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestRequestSkipPeerExpired checks if a peer to skip is not skipped
|
|
|
|
// after RequestTimeout has passed.
|
|
|
|
func TestRequestSkipPeerExpired(t *testing.T) {
|
|
|
|
addr := make([]byte, 32)
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
peer := enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8")
|
2018-09-13 12:42:19 +03:00
|
|
|
|
|
|
|
// set RequestTimeout to a low value and reset it after the test
|
|
|
|
defer func(t time.Duration) { RequestTimeout = t }(RequestTimeout)
|
|
|
|
RequestTimeout = 250 * time.Millisecond
|
|
|
|
|
|
|
|
peersToSkip := new(sync.Map)
|
|
|
|
peersToSkip.Store(peer.String(), time.Now())
|
|
|
|
r := NewRequest(addr, false, peersToSkip)
|
|
|
|
|
|
|
|
if !r.SkipPeer(peer.String()) {
|
|
|
|
t.Errorf("peer not skipped")
|
|
|
|
}
|
|
|
|
|
|
|
|
time.Sleep(500 * time.Millisecond)
|
|
|
|
|
|
|
|
if r.SkipPeer(peer.String()) {
|
|
|
|
t.Errorf("peer skipped")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestRequestSkipPeerPermanent checks if a peer to skip is not skipped
|
|
|
|
// after RequestTimeout is not skipped if it is set for a permanent skipping
|
|
|
|
// by value to peersToSkip map is not time.Duration.
|
|
|
|
func TestRequestSkipPeerPermanent(t *testing.T) {
|
|
|
|
addr := make([]byte, 32)
|
all: new p2p node representation (#17643)
Package p2p/enode provides a generalized representation of p2p nodes
which can contain arbitrary information in key/value pairs. It is also
the new home for the node database. The "v4" identity scheme is also
moved here from p2p/enr to remove the dependency on Ethereum crypto from
that package.
Record signature handling is changed significantly. The identity scheme
registry is removed and acceptable schemes must be passed to any method
that needs identity. This means records must now be validated explicitly
after decoding.
The enode API is designed to make signature handling easy and safe: most
APIs around the codebase work with enode.Node, which is a wrapper around
a valid record. Going from enr.Record to enode.Node requires a valid
signature.
* p2p/discover: port to p2p/enode
This ports the discovery code to the new node representation in
p2p/enode. The wire protocol is unchanged, this can be considered a
refactoring change. The Kademlia table can now deal with nodes using an
arbitrary identity scheme. This requires a few incompatible API changes:
- Table.Lookup is not available anymore. It used to take a public key
as argument because v4 protocol requires one. Its replacement is
LookupRandom.
- Table.Resolve takes *enode.Node instead of NodeID. This is also for
v4 protocol compatibility because nodes cannot be looked up by ID
alone.
- Types Node and NodeID are gone. Further commits in the series will be
fixes all over the the codebase to deal with those removals.
* p2p: port to p2p/enode and discovery changes
This adapts package p2p to the changes in p2p/discover. All uses of
discover.Node and discover.NodeID are replaced by their equivalents from
p2p/enode.
New API is added to retrieve the enode.Node instance of a peer. The
behavior of Server.Self with discovery disabled is improved. It now
tries much harder to report a working IP address, falling back to
127.0.0.1 if no suitable address can be determined through other means.
These changes were needed for tests of other packages later in the
series.
* p2p/simulations, p2p/testing: port to p2p/enode
No surprises here, mostly replacements of discover.Node, discover.NodeID
with their new equivalents. The 'interesting' API changes are:
- testing.ProtocolSession tracks complete nodes, not just their IDs.
- adapters.NodeConfig has a new method to create a complete node.
These changes were needed to make swarm tests work.
Note that the NodeID change makes the code incompatible with old
simulation snapshots.
* whisper/whisperv5, whisper/whisperv6: port to p2p/enode
This port was easy because whisper uses []byte for node IDs and
URL strings in the API.
* eth: port to p2p/enode
Again, easy to port because eth uses strings for node IDs and doesn't
care about node information in any way.
* les: port to p2p/enode
Apart from replacing discover.NodeID with enode.ID, most changes are in
the server pool code. It now deals with complete nodes instead
of (Pubkey, IP, Port) triples. The database format is unchanged for now,
but we should probably change it to use the node database later.
* node: port to p2p/enode
This change simply replaces discover.Node and discover.NodeID with their
new equivalents.
* swarm/network: port to p2p/enode
Swarm has its own node address representation, BzzAddr, containing both
an overlay address (the hash of a secp256k1 public key) and an underlay
address (enode:// URL).
There are no changes to the BzzAddr format in this commit, but certain
operations such as creating a BzzAddr from a node ID are now impossible
because node IDs aren't public keys anymore.
Most swarm-related changes in the series remove uses of
NewAddrFromNodeID, replacing it with NewAddr which takes a complete node
as argument. ToOverlayAddr is removed because we can just use the node
ID directly.
2018-09-25 01:59:00 +03:00
|
|
|
peer := enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8")
|
2018-09-13 12:42:19 +03:00
|
|
|
|
|
|
|
// set RequestTimeout to a low value and reset it after the test
|
|
|
|
defer func(t time.Duration) { RequestTimeout = t }(RequestTimeout)
|
|
|
|
RequestTimeout = 250 * time.Millisecond
|
|
|
|
|
|
|
|
peersToSkip := new(sync.Map)
|
|
|
|
peersToSkip.Store(peer.String(), true)
|
|
|
|
r := NewRequest(addr, false, peersToSkip)
|
|
|
|
|
|
|
|
if !r.SkipPeer(peer.String()) {
|
|
|
|
t.Errorf("peer not skipped")
|
|
|
|
}
|
|
|
|
|
|
|
|
time.Sleep(500 * time.Millisecond)
|
|
|
|
|
|
|
|
if !r.SkipPeer(peer.String()) {
|
|
|
|
t.Errorf("peer not skipped")
|
|
|
|
}
|
|
|
|
}
|