2018-06-20 07:06:27 -05: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 stream
|
|
|
|
|
|
|
|
import (
|
2019-05-11 05:55:06 -05:00
|
|
|
"bytes"
|
2018-06-20 07:06:27 -05:00
|
|
|
"context"
|
|
|
|
"fmt"
|
2019-05-11 05:55:06 -05:00
|
|
|
"io"
|
2018-06-20 07:06:27 -05:00
|
|
|
"sync"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
"github.com/ethereum/go-ethereum/node"
|
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-24 17:59:00 -05:00
|
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
2018-07-30 15:55:25 -05:00
|
|
|
"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
|
2019-04-10 09:50:58 -05:00
|
|
|
"github.com/ethereum/go-ethereum/swarm/chunk"
|
2018-06-20 07:06:27 -05:00
|
|
|
"github.com/ethereum/go-ethereum/swarm/log"
|
2018-07-30 15:55:25 -05:00
|
|
|
"github.com/ethereum/go-ethereum/swarm/network/simulation"
|
|
|
|
"github.com/ethereum/go-ethereum/swarm/state"
|
2018-06-20 07:06:27 -05:00
|
|
|
"github.com/ethereum/go-ethereum/swarm/storage"
|
2019-03-22 05:20:17 -05:00
|
|
|
"github.com/ethereum/go-ethereum/swarm/testutil"
|
2018-06-20 07:06:27 -05:00
|
|
|
)
|
|
|
|
|
2019-05-11 05:55:06 -05:00
|
|
|
// constants for random file generation
|
2018-06-20 07:06:27 -05:00
|
|
|
const (
|
|
|
|
minFileSize = 2
|
|
|
|
maxFileSize = 40
|
|
|
|
)
|
|
|
|
|
2019-05-11 05:55:06 -05:00
|
|
|
// TestFileRetrieval is a retrieval test for nodes.
|
|
|
|
// A configurable number of nodes can be
|
|
|
|
// provided to the test.
|
|
|
|
// Files are uploaded to nodes, other nodes try to retrieve the file
|
|
|
|
// Number of nodes can be provided via commandline too.
|
2018-06-20 07:06:27 -05:00
|
|
|
func TestFileRetrieval(t *testing.T) {
|
2019-02-20 15:57:42 -06:00
|
|
|
var nodeCount []int
|
|
|
|
|
2018-06-20 07:06:27 -05:00
|
|
|
if *nodes != 0 {
|
2019-02-20 15:57:42 -06:00
|
|
|
nodeCount = []int{*nodes}
|
2018-06-20 07:06:27 -05:00
|
|
|
} else {
|
2019-02-20 15:57:42 -06:00
|
|
|
nodeCount = []int{16}
|
|
|
|
|
2018-06-20 07:06:27 -05:00
|
|
|
if *longrunning {
|
2019-03-05 05:54:46 -06:00
|
|
|
nodeCount = append(nodeCount, 32, 64)
|
2019-02-20 15:57:42 -06:00
|
|
|
} else if testutil.RaceEnabled {
|
|
|
|
nodeCount = []int{4}
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
2019-02-20 15:57:42 -06:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, nc := range nodeCount {
|
2019-05-11 05:55:06 -05:00
|
|
|
runFileRetrievalTest(t, nc)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestPureRetrieval tests pure retrieval without syncing
|
|
|
|
// A configurable number of nodes and chunks
|
|
|
|
// can be provided to the test.
|
|
|
|
// A number of random chunks is generated, then stored directly in
|
|
|
|
// each node's localstore according to their address.
|
|
|
|
// Each chunk is supposed to end up at certain nodes
|
|
|
|
// With retrieval we then make sure that every node can actually retrieve
|
|
|
|
// the chunks.
|
|
|
|
func TestPureRetrieval(t *testing.T) {
|
|
|
|
var nodeCount []int
|
|
|
|
var chunkCount []int
|
|
|
|
|
|
|
|
if *nodes != 0 && *chunks != 0 {
|
|
|
|
nodeCount = []int{*nodes}
|
|
|
|
chunkCount = []int{*chunks}
|
|
|
|
} else {
|
|
|
|
nodeCount = []int{16}
|
|
|
|
chunkCount = []int{150}
|
|
|
|
|
|
|
|
if *longrunning {
|
|
|
|
nodeCount = append(nodeCount, 32, 64)
|
|
|
|
chunkCount = append(chunkCount, 32, 256)
|
|
|
|
} else if testutil.RaceEnabled {
|
|
|
|
nodeCount = []int{4}
|
|
|
|
chunkCount = []int{4}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, nc := range nodeCount {
|
|
|
|
for _, c := range chunkCount {
|
|
|
|
runPureRetrievalTest(t, nc, c)
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-11 05:55:06 -05:00
|
|
|
// TestRetrieval tests retrieval of chunks by random nodes.
|
|
|
|
// One node is randomly selected to be the pivot node.
|
|
|
|
// A configurable number of chunks and nodes can be
|
|
|
|
// provided to the test, the number of chunks is uploaded
|
|
|
|
// to the pivot node and other nodes try to retrieve the chunk(s).
|
|
|
|
// Number of chunks and nodes can be provided via commandline too.
|
2018-06-20 07:06:27 -05:00
|
|
|
func TestRetrieval(t *testing.T) {
|
2019-05-11 05:55:06 -05:00
|
|
|
// if nodes/chunks have been provided via commandline,
|
|
|
|
// run the tests with these values
|
2018-06-20 07:06:27 -05:00
|
|
|
if *nodes != 0 && *chunks != 0 {
|
2019-05-11 05:55:06 -05:00
|
|
|
runRetrievalTest(t, *chunks, *nodes)
|
2018-06-20 07:06:27 -05:00
|
|
|
} else {
|
2019-02-20 15:57:42 -06:00
|
|
|
nodeCnt := []int{16}
|
|
|
|
chnkCnt := []int{32}
|
|
|
|
|
2018-06-20 07:06:27 -05:00
|
|
|
if *longrunning {
|
2019-03-05 05:54:46 -06:00
|
|
|
nodeCnt = []int{16, 32, 64}
|
2018-06-20 07:06:27 -05:00
|
|
|
chnkCnt = []int{4, 32, 256}
|
2019-02-20 15:57:42 -06:00
|
|
|
} else if testutil.RaceEnabled {
|
|
|
|
nodeCnt = []int{4}
|
|
|
|
chnkCnt = []int{4}
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
2019-02-20 15:57:42 -06:00
|
|
|
|
2018-06-20 07:06:27 -05:00
|
|
|
for _, n := range nodeCnt {
|
|
|
|
for _, c := range chnkCnt {
|
2019-02-14 00:51:57 -06:00
|
|
|
t.Run(fmt.Sprintf("TestRetrieval_%d_%d", n, c), func(t *testing.T) {
|
2019-05-11 05:55:06 -05:00
|
|
|
runRetrievalTest(t, c, n)
|
2019-02-14 00:51:57 -06:00
|
|
|
})
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-08 13:28:44 -05:00
|
|
|
var retrievalSimServiceMap = map[string]simulation.ServiceFunc{
|
2019-02-01 02:58:46 -06:00
|
|
|
"streamer": func(ctx *adapters.ServiceContext, bucket *sync.Map) (s node.Service, cleanup func(), err error) {
|
|
|
|
addr, netStore, delivery, clean, err := newNetStoreAndDelivery(ctx, bucket)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
2018-10-08 13:28:44 -05:00
|
|
|
|
2019-03-05 05:54:46 -06:00
|
|
|
syncUpdateDelay := 1 * time.Second
|
|
|
|
if *longrunning {
|
|
|
|
syncUpdateDelay = 3 * time.Second
|
|
|
|
}
|
|
|
|
|
2019-02-01 02:58:46 -06:00
|
|
|
r := NewRegistry(addr.ID(), delivery, netStore, state.NewInmemoryStore(), &RegistryOptions{
|
|
|
|
Syncing: SyncingAutoSubscribe,
|
2019-03-05 05:54:46 -06:00
|
|
|
SyncUpdateDelay: syncUpdateDelay,
|
2019-02-01 02:58:46 -06:00
|
|
|
}, nil)
|
2018-10-08 13:28:44 -05:00
|
|
|
|
2019-02-01 02:58:46 -06:00
|
|
|
cleanup = func() {
|
|
|
|
r.Close()
|
|
|
|
clean()
|
|
|
|
}
|
2018-10-08 13:28:44 -05:00
|
|
|
|
2019-02-01 02:58:46 -06:00
|
|
|
return r, cleanup, nil
|
|
|
|
},
|
2018-10-08 13:28:44 -05:00
|
|
|
}
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2019-05-11 05:55:06 -05:00
|
|
|
// runPureRetrievalTest by uploading a snapshot,
|
|
|
|
// then starting a simulation, distribute chunks to nodes
|
|
|
|
// and start retrieval.
|
|
|
|
// The snapshot should have 'streamer' in its service list.
|
|
|
|
func runPureRetrievalTest(t *testing.T, nodeCount int, chunkCount int) {
|
|
|
|
|
|
|
|
t.Helper()
|
|
|
|
// the pure retrieval test needs a different service map, as we want
|
|
|
|
// syncing disabled and we don't need to set the syncUpdateDelay
|
|
|
|
sim := simulation.New(map[string]simulation.ServiceFunc{
|
|
|
|
"streamer": func(ctx *adapters.ServiceContext, bucket *sync.Map) (s node.Service, cleanup func(), err error) {
|
|
|
|
addr, netStore, delivery, clean, err := newNetStoreAndDelivery(ctx, bucket)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
r := NewRegistry(addr.ID(), delivery, netStore, state.NewInmemoryStore(), &RegistryOptions{
|
|
|
|
Syncing: SyncingDisabled,
|
|
|
|
}, nil)
|
|
|
|
|
|
|
|
cleanup = func() {
|
|
|
|
r.Close()
|
|
|
|
clean()
|
|
|
|
}
|
|
|
|
|
|
|
|
return r, cleanup, nil
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
|
|
|
defer sim.Close()
|
|
|
|
|
|
|
|
log.Info("Initializing test config", "node count", nodeCount)
|
|
|
|
|
|
|
|
conf := &synctestConfig{}
|
|
|
|
//map of discover ID to indexes of chunks expected at that ID
|
|
|
|
conf.idToChunksMap = make(map[enode.ID][]int)
|
|
|
|
//map of overlay address to discover ID
|
|
|
|
conf.addrToIDMap = make(map[string]enode.ID)
|
|
|
|
//array where the generated chunk hashes will be stored
|
|
|
|
conf.hashes = make([]storage.Address, 0)
|
|
|
|
|
|
|
|
ctx, cancelSimRun := context.WithTimeout(context.Background(), 3*time.Minute)
|
|
|
|
defer cancelSimRun()
|
|
|
|
|
|
|
|
filename := fmt.Sprintf("testing/snapshot_%d.json", nodeCount)
|
|
|
|
err := sim.UploadSnapshot(ctx, filename)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Info("Starting simulation")
|
|
|
|
|
|
|
|
result := sim.Run(ctx, func(ctx context.Context, sim *simulation.Simulation) error {
|
|
|
|
nodeIDs := sim.UpNodeIDs()
|
|
|
|
// first iteration: create addresses
|
|
|
|
for _, n := range nodeIDs {
|
|
|
|
//get the kademlia overlay address from this ID
|
|
|
|
a := n.Bytes()
|
|
|
|
//append it to the array of all overlay addresses
|
|
|
|
conf.addrs = append(conf.addrs, a)
|
|
|
|
//the proximity calculation is on overlay addr,
|
|
|
|
//the p2p/simulations check func triggers on enode.ID,
|
|
|
|
//so we need to know which overlay addr maps to which nodeID
|
|
|
|
conf.addrToIDMap[string(a)] = n
|
|
|
|
}
|
|
|
|
|
|
|
|
// now create random chunks
|
|
|
|
chunks := storage.GenerateRandomChunks(int64(chunkSize), chunkCount)
|
|
|
|
for _, chunk := range chunks {
|
|
|
|
conf.hashes = append(conf.hashes, chunk.Address())
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Debug("random chunks generated, mapping keys to nodes")
|
|
|
|
|
|
|
|
// map addresses to nodes
|
|
|
|
mapKeysToNodes(conf)
|
|
|
|
|
|
|
|
// second iteration: storing chunks at the peer whose
|
|
|
|
// overlay address is closest to a particular chunk's hash
|
|
|
|
log.Debug("storing every chunk at correspondent node store")
|
|
|
|
for _, id := range nodeIDs {
|
|
|
|
// for every chunk for this node (which are only indexes)...
|
|
|
|
for _, ch := range conf.idToChunksMap[id] {
|
|
|
|
item, ok := sim.NodeItem(id, bucketKeyStore)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("Error accessing localstore")
|
|
|
|
}
|
|
|
|
lstore := item.(chunk.Store)
|
|
|
|
// ...get the actual chunk
|
|
|
|
for _, chnk := range chunks {
|
|
|
|
if bytes.Equal(chnk.Address(), conf.hashes[ch]) {
|
|
|
|
// ...and store it in the localstore
|
|
|
|
if _, err = lstore.Put(ctx, chunk.ModePutUpload, chnk); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// now try to retrieve every chunk from every node
|
|
|
|
log.Debug("starting retrieval")
|
|
|
|
cnt := 0
|
|
|
|
|
|
|
|
for _, id := range nodeIDs {
|
|
|
|
item, ok := sim.NodeItem(id, bucketKeyFileStore)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("No filestore")
|
|
|
|
}
|
|
|
|
fileStore := item.(*storage.FileStore)
|
|
|
|
for _, chunk := range chunks {
|
|
|
|
reader, _ := fileStore.Retrieve(context.TODO(), chunk.Address())
|
|
|
|
content := make([]byte, chunkSize)
|
|
|
|
size, err := reader.Read(content)
|
|
|
|
//check chunk size and content
|
|
|
|
ok := true
|
|
|
|
if err != io.EOF {
|
|
|
|
log.Debug("Retrieve error", "err", err, "hash", chunk.Address(), "nodeId", id)
|
|
|
|
ok = false
|
|
|
|
}
|
|
|
|
if size != chunkSize {
|
|
|
|
log.Debug("size not equal chunkSize", "size", size, "hash", chunk.Address(), "nodeId", id)
|
|
|
|
ok = false
|
|
|
|
}
|
|
|
|
// skip chunk "metadata" for chunk.Data()
|
|
|
|
if !bytes.Equal(content, chunk.Data()[8:]) {
|
|
|
|
log.Debug("content not equal chunk data", "hash", chunk.Address(), "nodeId", id)
|
|
|
|
ok = false
|
|
|
|
}
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("Expected test to succeed at first run, but failed with chunk not found")
|
|
|
|
}
|
|
|
|
log.Debug(fmt.Sprintf("chunk with root hash %x successfully retrieved", chunk.Address()))
|
|
|
|
cnt++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
log.Info("retrieval terminated, chunks retrieved: ", "count", cnt)
|
|
|
|
return nil
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
log.Info("Simulation terminated")
|
|
|
|
|
|
|
|
if result.Error != nil {
|
|
|
|
t.Fatal(result.Error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// runFileRetrievalTest loads a snapshot file to construct the swarm network.
|
|
|
|
// The snapshot should have 'streamer' in its service list.
|
|
|
|
func runFileRetrievalTest(t *testing.T, nodeCount int) {
|
|
|
|
|
|
|
|
t.Helper()
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2018-10-08 13:28:44 -05:00
|
|
|
sim := simulation.New(retrievalSimServiceMap)
|
2018-07-30 15:55:25 -05:00
|
|
|
defer sim.Close()
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2019-03-05 05:54:46 -06:00
|
|
|
log.Info("Initializing test config", "node count", nodeCount)
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
conf := &synctestConfig{}
|
|
|
|
//map of discover ID to indexes of chunks expected at that ID
|
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-24 17:59:00 -05:00
|
|
|
conf.idToChunksMap = make(map[enode.ID][]int)
|
2018-07-30 15:55:25 -05:00
|
|
|
//map of overlay address to discover ID
|
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-24 17:59:00 -05:00
|
|
|
conf.addrToIDMap = make(map[string]enode.ID)
|
2018-07-30 15:55:25 -05:00
|
|
|
//array where the generated chunk hashes will be stored
|
|
|
|
conf.hashes = make([]storage.Address, 0)
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2019-03-22 05:20:17 -05:00
|
|
|
ctx, cancelSimRun := context.WithTimeout(context.Background(), 3*time.Minute)
|
|
|
|
defer cancelSimRun()
|
|
|
|
|
|
|
|
filename := fmt.Sprintf("testing/snapshot_%d.json", nodeCount)
|
|
|
|
err := sim.UploadSnapshot(ctx, filename)
|
2018-07-30 15:55:25 -05:00
|
|
|
if err != nil {
|
2019-05-11 05:55:06 -05:00
|
|
|
t.Fatal(err)
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
|
2019-03-05 05:54:46 -06:00
|
|
|
log.Info("Starting simulation")
|
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
result := sim.Run(ctx, func(ctx context.Context, sim *simulation.Simulation) error {
|
|
|
|
nodeIDs := sim.UpNodeIDs()
|
|
|
|
for _, n := range nodeIDs {
|
|
|
|
//get the kademlia overlay address from this ID
|
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-24 17:59:00 -05:00
|
|
|
a := n.Bytes()
|
2018-07-30 15:55:25 -05:00
|
|
|
//append it to the array of all overlay addresses
|
|
|
|
conf.addrs = append(conf.addrs, a)
|
|
|
|
//the proximity calculation is on overlay addr,
|
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-24 17:59:00 -05:00
|
|
|
//the p2p/simulations check func triggers on enode.ID,
|
2018-07-30 15:55:25 -05:00
|
|
|
//so we need to know which overlay addr maps to which nodeID
|
|
|
|
conf.addrToIDMap[string(a)] = n
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
//an array for the random files
|
|
|
|
var randomFiles []string
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
conf.hashes, randomFiles, err = uploadFilesToNodes(sim)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
|
2019-03-05 05:54:46 -06:00
|
|
|
log.Info("network healthy, start file checks")
|
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
// File retrieval check is repeated until all uploaded files are retrieved from all nodes
|
|
|
|
// or until the timeout is reached.
|
2018-10-08 13:28:44 -05:00
|
|
|
REPEAT:
|
|
|
|
for {
|
2018-07-30 15:55:25 -05:00
|
|
|
for _, id := range nodeIDs {
|
2018-10-08 13:28:44 -05:00
|
|
|
//for each expected file, check if it is in the local store
|
|
|
|
item, ok := sim.NodeItem(id, bucketKeyFileStore)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("No filestore")
|
|
|
|
}
|
|
|
|
fileStore := item.(*storage.FileStore)
|
|
|
|
//check all chunks
|
|
|
|
for i, hash := range conf.hashes {
|
|
|
|
reader, _ := fileStore.Retrieve(context.TODO(), hash)
|
|
|
|
//check that we can read the file size and that it corresponds to the generated file size
|
|
|
|
if s, err := reader.Size(ctx, nil); err != nil || s != int64(len(randomFiles[i])) {
|
2018-10-19 03:50:25 -05:00
|
|
|
log.Debug("Retrieve error", "err", err, "hash", hash, "nodeId", id)
|
2018-10-08 13:28:44 -05:00
|
|
|
time.Sleep(500 * time.Millisecond)
|
|
|
|
continue REPEAT
|
2018-07-30 15:55:25 -05:00
|
|
|
}
|
2018-10-08 13:28:44 -05:00
|
|
|
log.Debug(fmt.Sprintf("File with root hash %x successfully retrieved", hash))
|
2018-07-30 15:55:25 -05:00
|
|
|
}
|
|
|
|
}
|
2018-10-08 13:28:44 -05:00
|
|
|
return nil
|
2018-07-30 15:55:25 -05:00
|
|
|
}
|
2018-06-20 07:06:27 -05:00
|
|
|
})
|
|
|
|
|
2019-03-05 05:54:46 -06:00
|
|
|
log.Info("Simulation terminated")
|
|
|
|
|
2018-06-20 07:06:27 -05:00
|
|
|
if result.Error != nil {
|
2019-05-11 05:55:06 -05:00
|
|
|
t.Fatal(result.Error)
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-11 05:55:06 -05:00
|
|
|
// runRetrievalTest generates the given number of chunks.
|
|
|
|
// The test loads a snapshot file to construct the swarm network.
|
|
|
|
// The snapshot should have 'streamer' in its service list.
|
|
|
|
func runRetrievalTest(t *testing.T, chunkCount int, nodeCount int) {
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2019-02-14 00:51:57 -06:00
|
|
|
t.Helper()
|
2019-05-11 05:55:06 -05:00
|
|
|
|
2018-10-08 13:28:44 -05:00
|
|
|
sim := simulation.New(retrievalSimServiceMap)
|
2018-07-30 15:55:25 -05:00
|
|
|
defer sim.Close()
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
conf := &synctestConfig{}
|
|
|
|
//map of discover ID to indexes of chunks expected at that ID
|
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-24 17:59:00 -05:00
|
|
|
conf.idToChunksMap = make(map[enode.ID][]int)
|
2018-07-30 15:55:25 -05:00
|
|
|
//map of overlay address to discover ID
|
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-24 17:59:00 -05:00
|
|
|
conf.addrToIDMap = make(map[string]enode.ID)
|
2018-07-30 15:55:25 -05:00
|
|
|
//array where the generated chunk hashes will be stored
|
|
|
|
conf.hashes = make([]storage.Address, 0)
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2019-03-22 05:20:17 -05:00
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
|
|
|
defer cancel()
|
|
|
|
|
|
|
|
filename := fmt.Sprintf("testing/snapshot_%d.json", nodeCount)
|
|
|
|
err := sim.UploadSnapshot(ctx, filename)
|
2018-07-30 15:55:25 -05:00
|
|
|
if err != nil {
|
2019-05-11 05:55:06 -05:00
|
|
|
t.Fatal(err)
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
result := sim.Run(ctx, func(ctx context.Context, sim *simulation.Simulation) error {
|
|
|
|
nodeIDs := sim.UpNodeIDs()
|
|
|
|
for _, n := range nodeIDs {
|
|
|
|
//get the kademlia overlay address from this ID
|
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-24 17:59:00 -05:00
|
|
|
a := n.Bytes()
|
2018-07-30 15:55:25 -05:00
|
|
|
//append it to the array of all overlay addresses
|
|
|
|
conf.addrs = append(conf.addrs, a)
|
|
|
|
//the proximity calculation is on overlay addr,
|
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-24 17:59:00 -05:00
|
|
|
//the p2p/simulations check func triggers on enode.ID,
|
2018-07-30 15:55:25 -05:00
|
|
|
//so we need to know which overlay addr maps to which nodeID
|
|
|
|
conf.addrToIDMap[string(a)] = n
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
//this is the node selected for upload
|
2018-12-17 05:19:01 -06:00
|
|
|
node := sim.Net.GetRandomUpNode()
|
|
|
|
item, ok := sim.NodeItem(node.ID(), bucketKeyStore)
|
2018-07-30 15:55:25 -05:00
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("No localstore")
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
2019-05-11 05:55:06 -05:00
|
|
|
lstore := item.(chunk.Store)
|
|
|
|
conf.hashes, err = uploadFileToSingleNodeStore(node.ID(), chunkCount, lstore)
|
2018-07-30 15:55:25 -05:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2018-06-20 07:06:27 -05:00
|
|
|
|
2018-07-30 15:55:25 -05:00
|
|
|
// File retrieval check is repeated until all uploaded files are retrieved from all nodes
|
|
|
|
// or until the timeout is reached.
|
2018-10-08 13:28:44 -05:00
|
|
|
REPEAT:
|
|
|
|
for {
|
2018-07-30 15:55:25 -05:00
|
|
|
for _, id := range nodeIDs {
|
|
|
|
//for each expected chunk, check if it is in the local store
|
2018-10-08 13:28:44 -05:00
|
|
|
//check on the node's FileStore (netstore)
|
|
|
|
item, ok := sim.NodeItem(id, bucketKeyFileStore)
|
|
|
|
if !ok {
|
|
|
|
return fmt.Errorf("No filestore")
|
|
|
|
}
|
|
|
|
fileStore := item.(*storage.FileStore)
|
|
|
|
//check all chunks
|
|
|
|
for _, hash := range conf.hashes {
|
|
|
|
reader, _ := fileStore.Retrieve(context.TODO(), hash)
|
|
|
|
//check that we can read the chunk size and that it corresponds to the generated chunk size
|
|
|
|
if s, err := reader.Size(ctx, nil); err != nil || s != int64(chunkSize) {
|
2018-10-19 03:50:25 -05:00
|
|
|
log.Debug("Retrieve error", "err", err, "hash", hash, "nodeId", id, "size", s)
|
2018-10-08 13:28:44 -05:00
|
|
|
time.Sleep(500 * time.Millisecond)
|
|
|
|
continue REPEAT
|
2018-07-30 15:55:25 -05:00
|
|
|
}
|
2018-10-08 13:28:44 -05:00
|
|
|
log.Debug(fmt.Sprintf("Chunk with root hash %x successfully retrieved", hash))
|
2018-07-30 15:55:25 -05:00
|
|
|
}
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
2018-10-08 13:28:44 -05:00
|
|
|
// all nodes and files found, exit loop and return without error
|
|
|
|
return nil
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
if result.Error != nil {
|
2019-05-11 05:55:06 -05:00
|
|
|
t.Fatal(result.Error)
|
2018-06-20 07:06:27 -05:00
|
|
|
}
|
|
|
|
}
|