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

swarm/network/stream: fix visualized_snapshot_sync_sim_test

Browse source
This commit is contained in:
Fabio Barone 2018-12-09 19:03:50 -05:00
parent 7dbb075c07
commit b0f05e0790
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
swarm/network/stream/snapshot_sync_test.go
View file

@ -183,7 +183,7 @@ func streamerFunc(ctx *adapters.ServiceContext, bucket *sync.Map) (s node.Servic
func testSyncingViaGlobalSync(t *testing.T, chunkCount int, nodeCount int) { func testSyncingViaGlobalSync(t *testing.T, chunkCount int, nodeCount int) {
t.Skip("temporarily disabled as simulations.WaitTillHealthy cannot be trusted") //t.Skip("temporarily disabled as simulations.WaitTillHealthy cannot be trusted")
sim := simulation.New(simServiceMap) sim := simulation.New(simServiceMap)
defer sim.Close() defer sim.Close()
@ -266,6 +266,7 @@ func runSim(conf *synctestConfig, ctx context.Context, sim *simulation.Simulatio
} }
sim.Net.Events().Send(evt) sim.Net.Events().Send(evt)
} }
fmt.Println(hashes)
conf.hashes = append(conf.hashes, hashes...) conf.hashes = append(conf.hashes, hashes...)
mapKeysToNodes(conf) mapKeysToNodes(conf)

27
swarm/network/stream/visualized_snapshot_sync_sim_test.go
View file

@ -24,8 +24,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/simulations" "github.com/ethereum/go-ethereum/p2p/simulations"
"github.com/ethereum/go-ethereum/swarm/log" "github.com/ethereum/go-ethereum/swarm/log"
"github.com/ethereum/go-ethereum/swarm/network/simulation" "github.com/ethereum/go-ethereum/swarm/network/simulation"
@ -68,12 +67,12 @@ func watchSim(sim *simulation.Simulation) (context.Context, context.CancelFunc)
disconnections := sim.PeerEvents( disconnections := sim.PeerEvents(
context.Background(), context.Background(),
sim.NodeIDs(), sim.NodeIDs(),
simulation.NewPeerEventsFilter().Type(p2p.PeerEventTypeDrop), simulation.NewPeerEventsFilter().Drop(),
) )
go func() { go func() {
for d := range disconnections { for d := range disconnections {
log.Error("peer drop", "node", d.NodeID, "peer", d.Event.Peer) log.Error("peer drop", "node", d.NodeID, "peer", d.PeerID)
panic("unexpected disconnect") panic("unexpected disconnect")
cancelSimRun() cancelSimRun()
} }
@ -145,7 +144,7 @@ func sendSimTerminatedEvent(sim *simulation.Simulation) {
//can visualize messages like SendOfferedMsg, WantedHashesMsg, DeliveryMsg //can visualize messages like SendOfferedMsg, WantedHashesMsg, DeliveryMsg
func TestSnapshotSyncWithServer(t *testing.T) { func TestSnapshotSyncWithServer(t *testing.T) {
t.Skip("temporarily disabled as simulations.WaitTillHealthy cannot be trusted") //t.Skip("temporarily disabled as simulations.WaitTillHealthy cannot be trusted")
nodeCount, chunkCount, sim := setupSim(simServiceMap) nodeCount, chunkCount, sim := setupSim(simServiceMap)
defer sim.Close() defer sim.Close()
@ -153,9 +152,9 @@ func TestSnapshotSyncWithServer(t *testing.T) {
conf := &synctestConfig{} conf := &synctestConfig{}
//map of discover ID to indexes of chunks expected at that ID //map of discover ID to indexes of chunks expected at that ID
conf.idToChunksMap = make(map[discover.NodeID][]int) conf.idToChunksMap = make(map[enode.ID][]int)
//map of overlay address to discover ID //map of overlay address to discover ID
conf.addrToIDMap = make(map[string]discover.NodeID) conf.addrToIDMap = make(map[string]enode.ID)
//array where the generated chunk hashes will be stored //array where the generated chunk hashes will be stored
conf.hashes = make([]storage.Address, 0) conf.hashes = make([]storage.Address, 0)
@ -168,9 +167,9 @@ func TestSnapshotSyncWithServer(t *testing.T) {
defer cancelSimRun() defer cancelSimRun()
//setup filters in the event feed //setup filters in the event feed
offeredHashesFilter := simulation.NewPeerEventsFilter().Type(p2p.PeerEventTypeMsgRecv).Protocol("stream").MsgCode(1) offeredHashesFilter := simulation.NewPeerEventsFilter().ReceivedMessages().Protocol("stream").MsgCode(1)
wantedFilter := simulation.NewPeerEventsFilter().Type(p2p.PeerEventTypeMsgRecv).Protocol("stream").MsgCode(2) wantedFilter := simulation.NewPeerEventsFilter().ReceivedMessages().Protocol("stream").MsgCode(2)
deliveryFilter := simulation.NewPeerEventsFilter().Type(p2p.PeerEventTypeMsgRecv).Protocol("stream").MsgCode(6) deliveryFilter := simulation.NewPeerEventsFilter().ReceivedMessages().Protocol("stream").MsgCode(10)
eventC := sim.PeerEvents(ctx, sim.UpNodeIDs(), offeredHashesFilter, wantedFilter, deliveryFilter) eventC := sim.PeerEvents(ctx, sim.UpNodeIDs(), offeredHashesFilter, wantedFilter, deliveryFilter)
quit := make(chan struct{}) quit := make(chan struct{})
@ -186,27 +185,29 @@ func TestSnapshotSyncWithServer(t *testing.T) {
if e.Error != nil { if e.Error != nil {
t.Fatal(e.Error) t.Fatal(e.Error)
} }
if *e.Event.MsgCode == uint64(1) { if e.Event.Msg.Code == uint64(1) {
evt := &simulations.Event{ evt := &simulations.Event{
Type: EventTypeChunkOffered, Type: EventTypeChunkOffered,
Node: sim.Net.GetNode(e.NodeID), Node: sim.Net.GetNode(e.NodeID),
Control: false, Control: false,
} }
sim.Net.Events().Send(evt) sim.Net.Events().Send(evt)
} else if *e.Event.MsgCode == uint64(2) { } else if e.Event.Msg.Code == uint64(2) {
evt := &simulations.Event{ evt := &simulations.Event{
Type: EventTypeChunkWanted, Type: EventTypeChunkWanted,
Node: sim.Net.GetNode(e.NodeID), Node: sim.Net.GetNode(e.NodeID),
Control: false, Control: false,
} }
sim.Net.Events().Send(evt) sim.Net.Events().Send(evt)
} else if *e.Event.MsgCode == uint64(6) { } else if e.Event.Msg.Code == uint64(10) {
evt := &simulations.Event{ evt := &simulations.Event{
Type: EventTypeChunkDelivered, Type: EventTypeChunkDelivered,
Node: sim.Net.GetNode(e.NodeID), Node: sim.Net.GetNode(e.NodeID),
Control: false, Control: false,
} }
sim.Net.Events().Send(evt) sim.Net.Events().Send(evt)
} else {
fmt.Println(fmt.Sprintf("msg code: %d", e.Event.Msg.Code))
} }
} }
}() }()