From 4b43ecf7428146e2b2aa7413722c8f28a7457e3c Mon Sep 17 00:00:00 2001 From: acud Date: Mon, 30 Sep 2019 18:02:57 +0530 Subject: [PATCH] network/stream: move from v2 --- api/inspector.go | 2 +- api/inspector_test.go | 2 +- network/stream/{v2 => }/common_test.go | 0 network/stream/{v2 => }/cursors_test.go | 0 network/stream/{v2 => }/peer.go | 0 network/stream/{v2 => }/snapshot_sync_test.go | 2 +- network/stream/{v2 => }/stream.go | 0 network/stream/{v2 => }/sync_provider.go | 0 network/stream/{v2 => }/sync_provider_test.go | 0 network/stream/{v2 => }/syncing_test.go | 0 network/stream/{v2 => }/wire.go | 0 swarm.go | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename network/stream/{v2 => }/common_test.go (100%) rename network/stream/{v2 => }/cursors_test.go (100%) rename network/stream/{v2 => }/peer.go (100%) rename network/stream/{v2 => }/snapshot_sync_test.go (99%) rename network/stream/{v2 => }/stream.go (100%) rename network/stream/{v2 => }/sync_provider.go (100%) rename network/stream/{v2 => }/sync_provider_test.go (100%) rename network/stream/{v2 => }/syncing_test.go (100%) rename network/stream/{v2 => }/wire.go (100%) diff --git a/api/inspector.go b/api/inspector.go index e48ed6d6c0..a0e3ab3423 100644 --- a/api/inspector.go +++ b/api/inspector.go @@ -27,7 +27,7 @@ import ( "github.com/ethersphere/swarm/chunk" "github.com/ethersphere/swarm/log" "github.com/ethersphere/swarm/network" - stream "github.com/ethersphere/swarm/network/stream/v2" + "github.com/ethersphere/swarm/network/stream" "github.com/ethersphere/swarm/storage" ) diff --git a/api/inspector_test.go b/api/inspector_test.go index 2caefc3cb9..9563062d20 100644 --- a/api/inspector_test.go +++ b/api/inspector_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/ethersphere/swarm/network" - stream "github.com/ethersphere/swarm/network/stream/v2" + "github.com/ethersphere/swarm/network/stream" "github.com/ethersphere/swarm/storage" "github.com/ethersphere/swarm/storage/localstore" diff --git a/network/stream/v2/common_test.go b/network/stream/common_test.go similarity index 100% rename from network/stream/v2/common_test.go rename to network/stream/common_test.go diff --git a/network/stream/v2/cursors_test.go b/network/stream/cursors_test.go similarity index 100% rename from network/stream/v2/cursors_test.go rename to network/stream/cursors_test.go diff --git a/network/stream/v2/peer.go b/network/stream/peer.go similarity index 100% rename from network/stream/v2/peer.go rename to network/stream/peer.go diff --git a/network/stream/v2/snapshot_sync_test.go b/network/stream/snapshot_sync_test.go similarity index 99% rename from network/stream/v2/snapshot_sync_test.go rename to network/stream/snapshot_sync_test.go index b72b8bfb62..533f87cc8e 100644 --- a/network/stream/v2/snapshot_sync_test.go +++ b/network/stream/snapshot_sync_test.go @@ -106,7 +106,7 @@ func testSyncingViaGlobalSync(t *testing.T, chunkCount int, nodeCount int) { ctx, cancelSimRun := context.WithTimeout(context.Background(), 3*time.Minute) defer cancelSimRun() - filename := fmt.Sprintf("../testdata/snapshot_%d.json", nodeCount) + filename := fmt.Sprintf("testdata/snapshot_%d.json", nodeCount) err := sim.UploadSnapshot(ctx, filename) if err != nil { t.Fatal(err) diff --git a/network/stream/v2/stream.go b/network/stream/stream.go similarity index 100% rename from network/stream/v2/stream.go rename to network/stream/stream.go diff --git a/network/stream/v2/sync_provider.go b/network/stream/sync_provider.go similarity index 100% rename from network/stream/v2/sync_provider.go rename to network/stream/sync_provider.go diff --git a/network/stream/v2/sync_provider_test.go b/network/stream/sync_provider_test.go similarity index 100% rename from network/stream/v2/sync_provider_test.go rename to network/stream/sync_provider_test.go diff --git a/network/stream/v2/syncing_test.go b/network/stream/syncing_test.go similarity index 100% rename from network/stream/v2/syncing_test.go rename to network/stream/syncing_test.go diff --git a/network/stream/v2/wire.go b/network/stream/wire.go similarity index 100% rename from network/stream/v2/wire.go rename to network/stream/wire.go diff --git a/swarm.go b/swarm.go index 6d6252c796..9654ce995e 100644 --- a/swarm.go +++ b/swarm.go @@ -48,7 +48,7 @@ import ( "github.com/ethersphere/swarm/log" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/retrieval" - "github.com/ethersphere/swarm/network/stream/v2" + "github.com/ethersphere/swarm/network/stream" "github.com/ethersphere/swarm/p2p/protocols" "github.com/ethersphere/swarm/pss" pssmessage "github.com/ethersphere/swarm/pss/message"