diff options
| author | Anton Evangelatov <anton.evangelatov@gmail.com> | 2019-02-01 16:58:46 +0800 |
|---|---|---|
| committer | Viktor Trón <viktor.tron@gmail.com> | 2019-02-01 16:58:46 +0800 |
| commit | 597597e8b27ee60a25b4533771702892e72898a5 (patch) | |
| tree | edb8194e485c9aecdb1234486bbd95e09396a07c /swarm/network/stream/visualized_snapshot_sync_sim_test.go | |
| parent | a89170cfb2acd33aea99551cb9524bcdfaad96ec (diff) | |
| download | go-tangerine-597597e8b27ee60a25b4533771702892e72898a5.tar go-tangerine-597597e8b27ee60a25b4533771702892e72898a5.tar.gz go-tangerine-597597e8b27ee60a25b4533771702892e72898a5.tar.bz2 go-tangerine-597597e8b27ee60a25b4533771702892e72898a5.tar.lz go-tangerine-597597e8b27ee60a25b4533771702892e72898a5.tar.xz go-tangerine-597597e8b27ee60a25b4533771702892e72898a5.tar.zst go-tangerine-597597e8b27ee60a25b4533771702892e72898a5.zip | |
swarm/network: refactor simulation tests bootstrap (#18975)
Diffstat (limited to 'swarm/network/stream/visualized_snapshot_sync_sim_test.go')
| -rw-r--r-- | swarm/network/stream/visualized_snapshot_sync_sim_test.go | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/swarm/network/stream/visualized_snapshot_sync_sim_test.go b/swarm/network/stream/visualized_snapshot_sync_sim_test.go index 3b7d0d743..3694dd311 100644 --- a/swarm/network/stream/visualized_snapshot_sync_sim_test.go +++ b/swarm/network/stream/visualized_snapshot_sync_sim_test.go @@ -24,7 +24,6 @@ import ( "errors" "fmt" "io" - "os" "sync" "testing" "time" @@ -37,7 +36,6 @@ import ( "github.com/ethereum/go-ethereum/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" "github.com/ethereum/go-ethereum/swarm/network/simulation" "github.com/ethereum/go-ethereum/swarm/state" "github.com/ethereum/go-ethereum/swarm/storage" @@ -169,21 +167,10 @@ func TestSnapshotSyncWithServer(t *testing.T) { sim := simulation.New(map[string]simulation.ServiceFunc{ "streamer": func(ctx *adapters.ServiceContext, bucket *sync.Map) (s node.Service, cleanup func(), err error) { - n := ctx.Config.Node() - addr := network.NewAddr(n) - store, datadir, err := createTestLocalStorageForID(n.ID(), addr) + addr, netStore, delivery, clean, err := newNetStoreAndDeliveryWithRequestFunc(ctx, bucket, dummyRequestFromPeers) if err != nil { return nil, nil, err } - bucket.Store(bucketKeyStore, store) - localStore := store.(*storage.LocalStore) - netStore, err := storage.NewNetStore(localStore, nil) - if err != nil { - return nil, nil, err - } - kad := network.NewKademlia(addr.Over(), network.NewKadParams()) - delivery := NewDelivery(kad, netStore) - netStore.NewNetFetcherFunc = network.NewFetcherFactory(dummyRequestFromPeers, true).New r := NewRegistry(addr.ID(), delivery, netStore, state.NewInmemoryStore(), &RegistryOptions{ Retrieval: RetrievalDisabled, @@ -199,9 +186,8 @@ func TestSnapshotSyncWithServer(t *testing.T) { bucket.Store(bucketKeyRegistry, tr) cleanup = func() { - netStore.Close() tr.Close() - os.RemoveAll(datadir) + clean() } return tr, cleanup, nil |