network/stream: move from v2 (#1841)

ethersphere · Sep 30, 2019 · 118075e · 118075e
1 parent ea3a7e2
commit 118075e
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 → network/stream/common_test.go b/network/stream/v2/common_test.go → network/stream/common_test.go
diff --git a/network/stream/v2/cursors_test.go → network/stream/cursors_test.go b/network/stream/v2/cursors_test.go → network/stream/cursors_test.go
diff --git a/network/stream/v2/peer.go → network/stream/peer.go b/network/stream/v2/peer.go → network/stream/peer.go
diff --git a/network/stream/v2/snapshot_sync_test.go → network/stream/snapshot_sync_test.go b/network/stream/v2/snapshot_sync_test.go → 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 → network/stream/stream.go b/network/stream/v2/stream.go → network/stream/stream.go
diff --git a/network/stream/v2/sync_provider.go → network/stream/sync_provider.go b/network/stream/v2/sync_provider.go → network/stream/sync_provider.go
diff --git a/network/stream/v2/sync_provider_test.go → network/stream/sync_provider_test.go b/network/stream/v2/sync_provider_test.go → network/stream/sync_provider_test.go
diff --git a/network/stream/v2/syncing_test.go → network/stream/syncing_test.go b/network/stream/v2/syncing_test.go → network/stream/syncing_test.go
diff --git a/network/stream/v2/wire.go → network/stream/wire.go b/network/stream/v2/wire.go → network/stream/wire.go
diff --git 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"