From 3fae03a6b7d5b95578e7abbf81df4f8ac107f8e6 Mon Sep 17 00:00:00 2001 From: Mark Vujevits Date: Fri, 19 Oct 2018 11:18:07 +0200 Subject: [PATCH] write tests for RequestFromPeers --- swarm/network/stream/delivery_test.go | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index c3c0c14f03..549a879c71 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -36,6 +36,7 @@ import ( p2ptest "github.com/ethereum/go-ethereum/p2p/testing" "github.com/ethereum/go-ethereum/swarm/log" "github.com/ethereum/go-ethereum/swarm/network" + pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" "github.com/ethereum/go-ethereum/swarm/network/simulation" "github.com/ethereum/go-ethereum/swarm/state" "github.com/ethereum/go-ethereum/swarm/storage" @@ -241,14 +242,19 @@ func TestRequestFromPeers(t *testing.T) { }, to) to.On(peer) r := NewRegistry(addr.ID(), delivery, nil, nil, nil) - r.setPeer(NewPeer(protocolsPeer, r)) - ctx := context.Background() + + sp := &Peer{ + Peer: protocolsPeer, + pq: pq.New(int(PriorityQueue), PriorityQueueCap), + streamer: r, + } + r.setPeer(sp) req := network.NewRequest( storage.Address(hash0[:]), true, &sync.Map{}, ) - + ctx := context.Background() id, _, err := delivery.RequestFromPeers(ctx, req) if err != nil { @@ -273,14 +279,20 @@ func TestRequestFromPeersWithLightNode(t *testing.T) { }, to) to.On(peer) r := NewRegistry(addr.ID(), delivery, nil, nil, nil) - r.setPeer(NewPeer(protocolsPeer, r)) - ctx := context.Background() + sp := &Peer{ + Peer: protocolsPeer, + pq: pq.New(int(PriorityQueue), PriorityQueueCap), + streamer: r, + } + r.setPeer(sp) + req := network.NewRequest( storage.Address(hash0[:]), true, &sync.Map{}, ) + ctx := context.Background() _, _, err := delivery.RequestFromPeers(ctx, req) expectedError := "no peer found"