Skip to content
This repository has been archived by the owner on Aug 2, 2021. It is now read-only.

network/stream: move from v2 #1841

Merged
merged 1 commit into from
Sep 30, 2019
Merged

network/stream: move from v2 #1841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/inspector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
0 network/stream/v2/common_test.go → network/stream/common_test.go
View file
Open in desktop
File renamed without changes.
0 network/stream/v2/cursors_test.go → network/stream/cursors_test.go
View file
Open in desktop
File renamed without changes.
0 network/stream/v2/peer.go → network/stream/peer.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion network/stream/v2/snapshot_sync_test.go → network/stream/snapshot_sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
0 network/stream/v2/stream.go → network/stream/stream.go
View file
Open in desktop
File renamed without changes.
0 network/stream/v2/sync_provider.go → network/stream/sync_provider.go
View file
Open in desktop
File renamed without changes.
0 network/stream/v2/sync_provider_test.go → network/stream/sync_provider_test.go
View file
Open in desktop
File renamed without changes.
0 network/stream/v2/syncing_test.go → network/stream/syncing_test.go
View file
Open in desktop
File renamed without changes.
0 network/stream/v2/wire.go → network/stream/wire.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion swarm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down