swarm: address review comments

swarm/network/stream/common_test.go

@@ -112,9 +112,7 @@ func newStreamerTester(t *testing.T) (*p2ptest.ProtocolTester, *Registry, *stora
 
 	db := storage.NewDBAPI(localStore)
 	delivery := NewDelivery(to, db)
-	streamer := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
+	streamer := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), nil)
-		SkipCheck: false,
-	})
 	teardown := func() {
 		streamer.Close()
 		removeDataDir()

swarm/network/stream/delivery_test.go

@@ -330,11 +330,8 @@ func testDeliveryFromNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
 			delivery := NewDelivery(kad, db)
 
 			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
-				SkipCheck:  skipCheck,
+				SkipCheck: skipCheck,
-				DoRetrieve: false,
 			})
-			RegisterSwarmSyncerServer(r, db)
-			RegisterSwarmSyncerClient(r, db)
 
 			retrieveFunc := func(ctx context.Context, chunk *storage.Chunk) error {
 				return delivery.RequestFromPeers(ctx, chunk.Addr[:], skipCheck)
@@ -505,12 +502,9 @@ func benchmarkDeliveryFromNodes(b *testing.B, nodes, conns, chunkCount int, skip
 
 			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
 				SkipCheck:       skipCheck,
-				DoRetrieve:      false,
 				DoSync:          true,
 				SyncUpdateDelay: 0,
 			})
-			RegisterSwarmSyncerServer(r, db)
-			RegisterSwarmSyncerClient(r, db)
 
 			retrieveFunc := func(ctx context.Context, chunk *storage.Chunk) error {
 				return delivery.RequestFromPeers(ctx, chunk.Addr[:], skipCheck)

swarm/network/stream/snapshot_retrieval_test.go

@@ -137,13 +137,9 @@ func runFileRetrievalTest(nodeCount int) error {
 			delivery := NewDelivery(kad, db)
 
 			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
-				SkipCheck:       false,
-				DoRetrieve:      false,
 				DoSync:          true,
 				SyncUpdateDelay: 0,
 			})
-			RegisterSwarmSyncerServer(r, db)
-			RegisterSwarmSyncerClient(r, db)
 
 			fileStore := storage.NewFileStore(storage.NewNetStore(localStore, nil), storage.NewFileStoreParams())
 			bucketKeyFileStore = simulation.BucketKey("filestore")
@@ -288,13 +284,9 @@ func runRetrievalTest(chunkCount int, nodeCount int) error {
 			delivery := NewDelivery(kad, db)
 
 			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
-				SkipCheck:       false,
-				DoRetrieve:      false,
 				DoSync:          true,
 				SyncUpdateDelay: 0,
 			})
-			RegisterSwarmSyncerServer(r, db)
-			RegisterSwarmSyncerClient(r, db)
 
 			fileStore := storage.NewFileStore(storage.NewNetStore(localStore, nil), storage.NewFileStoreParams())
 			bucketKeyFileStore = simulation.BucketKey("filestore")

swarm/network/stream/snapshot_sync_test.go

@@ -139,13 +139,9 @@ func testSyncing(t *testing.T, chunkCount int, nodeCount int) {
 			delivery := NewDelivery(kad, db)
 
 			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
-				SkipCheck:       false,
-				DoRetrieve:      false,
 				DoSync:          true,
 				SyncUpdateDelay: 3 * time.Second,
 			})
-			RegisterSwarmSyncerServer(r, db)
-			RegisterSwarmSyncerClient(r, db)
 
 			fileStore := storage.NewFileStore(storage.NewNetStore(localStore, nil), storage.NewFileStoreParams())
 			testRegistry := &TestRegistry{Registry: r, fileStore: fileStore}
@@ -311,13 +307,7 @@ func runSyncTest(chunkCount int, nodeCount int) error {
 			kad := network.NewKademlia(addr.Over(), network.NewKadParams())
 			delivery := NewDelivery(kad, db)
 
-			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
+			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), nil)
-				SkipCheck:  false,
-				DoRetrieve: false,
-				DoSync:     false,
-			})
-			RegisterSwarmSyncerServer(r, db)
-			RegisterSwarmSyncerClient(r, db)
 
 			fileStore := storage.NewFileStore(storage.NewNetStore(localStore, nil), storage.NewFileStoreParams())
 			testRegistry := &TestRegistry{Registry: r, fileStore: fileStore}

swarm/network/stream/syncer_test.go

@@ -109,8 +109,7 @@ func testSyncBetweenNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
 			bucket.Store(bucketKeyDelivery, delivery)
 
 			r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), &RegistryOptions{
-				SkipCheck:  skipCheck,
+				SkipCheck: skipCheck,
-				DoRetrieve: false,
 			})
 
 			fileStore := storage.NewFileStore(storage.NewNetStore(localStore, nil), storage.NewFileStoreParams())
@@ -235,7 +234,6 @@ func testSyncBetweenNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck
 			}
 			log.Debug("sync check", "node", node, "index", i, "bin", po, "found", found, "total", total)
 		}
-		log.Error("total", "total", total)
 		if total == found && total > 0 {
 			return nil
 		}