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

swarm: address review comments

Browse source
This commit is contained in:
Fabio Barone 2018-07-20 17:26:44 -05:00
parent bf87fdc3d7
commit 2bff9e893e
5 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
swarm/network/stream/common_test.go
View file

@ -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{
SkipCheck: false,
})
streamer := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), nil)
teardown := func() {
streamer.Close()
removeDataDir()

8
swarm/network/stream/delivery_test.go
View file

@ -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,
DoRetrieve: false,
SkipCheck: skipCheck,
})
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)

8
swarm/network/stream/snapshot_retrieval_test.go
View file

@ -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")

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

@ -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{
SkipCheck: false,
DoRetrieve: false,
DoSync: false,
})
RegisterSwarmSyncerServer(r, db)
RegisterSwarmSyncerClient(r, db)
r := NewRegistry(addr, delivery, db, state.NewInmemoryStore(), nil)
fileStore := storage.NewFileStore(storage.NewNetStore(localStore, nil), storage.NewFileStoreParams())
testRegistry := &TestRegistry{Registry: r, fileStore: fileStore}

4
swarm/network/stream/syncer_test.go
View file

@ -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,
DoRetrieve: false,
SkipCheck: skipCheck,
})
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
}