From 4581c57478eb1b93d681b113eb2f609f30a9b312 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 22 Sep 2015 19:38:46 +0200 Subject: [PATCH] Fix import paths --- .../src/github.com/syncthing/relaysrv/client/client.go | 4 ++-- .../src/github.com/syncthing/relaysrv/client/methods.go | 4 ++-- .../src/github.com/syncthing/relaysrv/protocol/packets.go | 2 +- cmd/stfileinfo/main.go | 2 +- cmd/stfinddevice/main.go | 2 +- cmd/stindex/main.go | 2 +- cmd/syncthing/connections.go | 4 ++-- cmd/syncthing/gui.go | 2 +- cmd/syncthing/main.go | 2 +- cmd/syncthing/main_test.go | 2 +- cmd/syncthing/perfstats_unix.go | 2 +- cmd/syncthing/usage_report.go | 2 +- lib/config/config.go | 2 +- lib/config/config_test.go | 2 +- lib/config/wrapper.go | 2 +- lib/db/blockmap.go | 2 +- lib/db/blockmap_test.go | 2 +- lib/db/leveldb.go | 2 +- lib/db/set.go | 2 +- lib/db/set_test.go | 2 +- lib/db/truncated.go | 2 +- lib/discover/cache.go | 2 +- lib/discover/discover.go | 2 +- lib/discover/global.go | 2 +- lib/discover/global_test.go | 2 +- lib/discover/local.go | 2 +- lib/model/connection.go | 2 +- lib/model/deviceactivity.go | 2 +- lib/model/deviceactivity_test.go | 2 +- lib/model/model.go | 2 +- lib/model/model_test.go | 2 +- lib/model/rwfolder.go | 2 +- lib/model/rwfolder_test.go | 2 +- lib/model/sharedpullerstate.go | 2 +- lib/rc/rc.go | 2 +- lib/relay/client/client.go | 4 ++-- lib/relay/client/methods.go | 4 ++-- lib/relay/protocol/packets.go | 2 +- lib/relay/relay.go | 4 ++-- lib/scanner/blockqueue.go | 2 +- lib/scanner/blocks.go | 2 +- lib/scanner/blocks_test.go | 2 +- lib/scanner/walk.go | 2 +- lib/scanner/walk_test.go | 2 +- lib/symlinks/symlink_windows.go | 2 +- test/filetype_test.go | 2 +- test/http_test.go | 2 +- test/manypeers_test.go | 2 +- test/norestart_test.go | 2 +- test/override_test.go | 2 +- test/symlink_test.go | 2 +- test/sync_test.go | 2 +- 52 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/client.go b/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/client.go index 89b16e000..2e1b51e03 100644 --- a/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/client.go +++ b/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/client.go @@ -10,8 +10,8 @@ import ( "net/url" "time" - syncthingprotocol "github.com/syncthing/protocol" - "github.com/syncthing/relaysrv/protocol" + syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" + "github.com/syncthing/syncthing/lib/relay/protocol" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/methods.go b/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/methods.go index 67a9a71c1..ced788b8a 100644 --- a/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/methods.go +++ b/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/methods.go @@ -11,8 +11,8 @@ import ( "strings" "time" - syncthingprotocol "github.com/syncthing/protocol" - "github.com/syncthing/relaysrv/protocol" + syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" + "github.com/syncthing/syncthing/lib/relay/protocol" ) func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs []tls.Certificate) (protocol.SessionInvitation, error) { diff --git a/Godeps/_workspace/src/github.com/syncthing/relaysrv/protocol/packets.go b/Godeps/_workspace/src/github.com/syncthing/relaysrv/protocol/packets.go index 1b21eba24..f11954caa 100644 --- a/Godeps/_workspace/src/github.com/syncthing/relaysrv/protocol/packets.go +++ b/Godeps/_workspace/src/github.com/syncthing/relaysrv/protocol/packets.go @@ -9,7 +9,7 @@ import ( "fmt" "net" - syncthingprotocol "github.com/syncthing/protocol" + syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" ) const ( diff --git a/cmd/stfileinfo/main.go b/cmd/stfileinfo/main.go index e663dc76d..0feffbea5 100644 --- a/cmd/stfileinfo/main.go +++ b/cmd/stfileinfo/main.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/scanner" ) diff --git a/cmd/stfinddevice/main.go b/cmd/stfinddevice/main.go index f01fe5fbd..939a3c0f3 100644 --- a/cmd/stfinddevice/main.go +++ b/cmd/stfinddevice/main.go @@ -15,9 +15,9 @@ import ( "os" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/discover" + "github.com/syncthing/syncthing/lib/protocol" ) var timeout = 5 * time.Second diff --git a/cmd/stindex/main.go b/cmd/stindex/main.go index 1b6a5605b..370aab6bb 100644 --- a/cmd/stindex/main.go +++ b/cmd/stindex/main.go @@ -13,8 +13,8 @@ import ( "log" "os" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/db" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" ) diff --git a/cmd/syncthing/connections.go b/cmd/syncthing/connections.go index 1be9db1bb..bdddaec83 100644 --- a/cmd/syncthing/connections.go +++ b/cmd/syncthing/connections.go @@ -15,14 +15,14 @@ import ( "sync" "time" - "github.com/syncthing/protocol" - "github.com/syncthing/relaysrv/client" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/discover" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/model" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/relay" + "github.com/syncthing/syncthing/lib/relay/client" "github.com/thejerf/suture" ) diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go index ed3697fe5..6a1d4f2ef 100644 --- a/cmd/syncthing/gui.go +++ b/cmd/syncthing/gui.go @@ -25,7 +25,6 @@ import ( "time" "github.com/calmh/logger" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/auto" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" @@ -33,6 +32,7 @@ import ( "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/model" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/relay" "github.com/syncthing/syncthing/lib/sync" "github.com/syncthing/syncthing/lib/tlsutil" diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index dc96196a8..5c7f3c6f2 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -27,13 +27,13 @@ import ( "github.com/calmh/logger" "github.com/juju/ratelimit" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/discover" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/model" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/relay" "github.com/syncthing/syncthing/lib/symlinks" "github.com/syncthing/syncthing/lib/tlsutil" diff --git a/cmd/syncthing/main_test.go b/cmd/syncthing/main_test.go index b5b71b950..7730b7dfa 100644 --- a/cmd/syncthing/main_test.go +++ b/cmd/syncthing/main_test.go @@ -10,10 +10,10 @@ import ( "os" "testing" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/model" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/cmd/syncthing/perfstats_unix.go b/cmd/syncthing/perfstats_unix.go index 0ed00bd50..2b9af3637 100644 --- a/cmd/syncthing/perfstats_unix.go +++ b/cmd/syncthing/perfstats_unix.go @@ -15,7 +15,7 @@ import ( "syscall" "time" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" ) func init() { diff --git a/cmd/syncthing/usage_report.go b/cmd/syncthing/usage_report.go index c2ee687c3..0d0505ee5 100644 --- a/cmd/syncthing/usage_report.go +++ b/cmd/syncthing/usage_report.go @@ -19,9 +19,9 @@ import ( "sort" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/model" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/upgrade" "github.com/thejerf/suture" ) diff --git a/lib/config/config.go b/lib/config/config.go index 5cd22a446..bd19c32db 100644 --- a/lib/config/config.go +++ b/lib/config/config.go @@ -20,8 +20,8 @@ import ( "strconv" "strings" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "golang.org/x/crypto/bcrypt" ) diff --git a/lib/config/config_test.go b/lib/config/config_test.go index b6ff45341..626452f89 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" ) var device1, device2, device3, device4 protocol.DeviceID diff --git a/lib/config/wrapper.go b/lib/config/wrapper.go index 394cf82ef..2460fbdae 100644 --- a/lib/config/wrapper.go +++ b/lib/config/wrapper.go @@ -9,9 +9,9 @@ package config import ( "os" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/db/blockmap.go b/lib/db/blockmap.go index 3caa9ff5b..41354d348 100644 --- a/lib/db/blockmap.go +++ b/lib/db/blockmap.go @@ -17,8 +17,8 @@ import ( "encoding/binary" "fmt" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" diff --git a/lib/db/blockmap_test.go b/lib/db/blockmap_test.go index 3a1587038..110383d23 100644 --- a/lib/db/blockmap_test.go +++ b/lib/db/blockmap_test.go @@ -9,7 +9,7 @@ package db import ( "testing" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/lib/db/leveldb.go b/lib/db/leveldb.go index ec64bda2c..78f0944e9 100644 --- a/lib/db/leveldb.go +++ b/lib/db/leveldb.go @@ -15,7 +15,7 @@ import ( "runtime" "sort" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/lib/db/set.go b/lib/db/set.go index 8924c958b..990cebd7c 100644 --- a/lib/db/set.go +++ b/lib/db/set.go @@ -13,8 +13,8 @@ package db import ( - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/lib/db/set_test.go b/lib/db/set_test.go index c4318f5c7..abe355c48 100644 --- a/lib/db/set_test.go +++ b/lib/db/set_test.go @@ -13,8 +13,8 @@ import ( "sort" "testing" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/db" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/lib/db/truncated.go b/lib/db/truncated.go index 3fa7fcca5..c15e529b2 100644 --- a/lib/db/truncated.go +++ b/lib/db/truncated.go @@ -6,7 +6,7 @@ package db -import "github.com/syncthing/protocol" +import "github.com/syncthing/syncthing/lib/protocol" type FileInfoTruncated struct { protocol.FileInfo diff --git a/lib/discover/cache.go b/lib/discover/cache.go index 2fb99f9f1..ce2f99ce8 100644 --- a/lib/discover/cache.go +++ b/lib/discover/cache.go @@ -10,7 +10,7 @@ import ( stdsync "sync" "time" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" "github.com/thejerf/suture" ) diff --git a/lib/discover/discover.go b/lib/discover/discover.go index 8f59ec157..82bd2b7cb 100644 --- a/lib/discover/discover.go +++ b/lib/discover/discover.go @@ -9,7 +9,7 @@ package discover import ( "time" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/thejerf/suture" ) diff --git a/lib/discover/global.go b/lib/discover/global.go index 5d5ab3496..a42b765ef 100644 --- a/lib/discover/global.go +++ b/lib/discover/global.go @@ -18,8 +18,8 @@ import ( stdsync "sync" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/events" + "github.com/syncthing/syncthing/lib/protocol" ) type globalClient struct { diff --git a/lib/discover/global_test.go b/lib/discover/global_test.go index b4fb24e5c..000824241 100644 --- a/lib/discover/global_test.go +++ b/lib/discover/global_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/tlsutil" ) diff --git a/lib/discover/local.go b/lib/discover/local.go index 71b164743..943c799fe 100644 --- a/lib/discover/local.go +++ b/lib/discover/local.go @@ -17,9 +17,9 @@ import ( "strconv" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/beacon" "github.com/syncthing/syncthing/lib/events" + "github.com/syncthing/syncthing/lib/protocol" "github.com/thejerf/suture" ) diff --git a/lib/model/connection.go b/lib/model/connection.go index 78e9f0f2c..fb7f930ec 100644 --- a/lib/model/connection.go +++ b/lib/model/connection.go @@ -10,7 +10,7 @@ import ( "crypto/tls" "net" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" ) type IntermediateConnection struct { diff --git a/lib/model/deviceactivity.go b/lib/model/deviceactivity.go index cab14bcee..f6c5ba665 100644 --- a/lib/model/deviceactivity.go +++ b/lib/model/deviceactivity.go @@ -7,7 +7,7 @@ package model import ( - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/model/deviceactivity_test.go b/lib/model/deviceactivity_test.go index 97c8f520f..465957711 100644 --- a/lib/model/deviceactivity_test.go +++ b/lib/model/deviceactivity_test.go @@ -9,7 +9,7 @@ package model import ( "testing" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" ) func TestDeviceActivity(t *testing.T) { diff --git a/lib/model/model.go b/lib/model/model.go index 505e9a39e..a0af20e20 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -22,12 +22,12 @@ import ( stdsync "sync" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/ignore" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/scanner" "github.com/syncthing/syncthing/lib/stats" "github.com/syncthing/syncthing/lib/symlinks" diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 31df11f4d..6a831b76a 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/lib/model/rwfolder.go b/lib/model/rwfolder.go index fa49ba273..ff5c716e7 100644 --- a/lib/model/rwfolder.go +++ b/lib/model/rwfolder.go @@ -16,12 +16,12 @@ import ( "sort" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/ignore" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/scanner" "github.com/syncthing/syncthing/lib/symlinks" "github.com/syncthing/syncthing/lib/sync" diff --git a/lib/model/rwfolder_test.go b/lib/model/rwfolder_test.go index df34fdf4a..2d5417e3d 100644 --- a/lib/model/rwfolder_test.go +++ b/lib/model/rwfolder_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/scanner" "github.com/syncthing/syncthing/lib/sync" diff --git a/lib/model/sharedpullerstate.go b/lib/model/sharedpullerstate.go index 4828dcf5b..5fdd72066 100644 --- a/lib/model/sharedpullerstate.go +++ b/lib/model/sharedpullerstate.go @@ -11,8 +11,8 @@ import ( "os" "path/filepath" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/db" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/rc/rc.go b/lib/rc/rc.go index b5975436a..9dd28d0e8 100644 --- a/lib/rc/rc.go +++ b/lib/rc/rc.go @@ -25,8 +25,8 @@ import ( stdsync "sync" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/relay/client/client.go b/lib/relay/client/client.go index 89b16e000..2e1b51e03 100644 --- a/lib/relay/client/client.go +++ b/lib/relay/client/client.go @@ -10,8 +10,8 @@ import ( "net/url" "time" - syncthingprotocol "github.com/syncthing/protocol" - "github.com/syncthing/relaysrv/protocol" + syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" + "github.com/syncthing/syncthing/lib/relay/protocol" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/relay/client/methods.go b/lib/relay/client/methods.go index 67a9a71c1..ced788b8a 100644 --- a/lib/relay/client/methods.go +++ b/lib/relay/client/methods.go @@ -11,8 +11,8 @@ import ( "strings" "time" - syncthingprotocol "github.com/syncthing/protocol" - "github.com/syncthing/relaysrv/protocol" + syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" + "github.com/syncthing/syncthing/lib/relay/protocol" ) func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs []tls.Certificate) (protocol.SessionInvitation, error) { diff --git a/lib/relay/protocol/packets.go b/lib/relay/protocol/packets.go index 1b21eba24..f11954caa 100644 --- a/lib/relay/protocol/packets.go +++ b/lib/relay/protocol/packets.go @@ -9,7 +9,7 @@ import ( "fmt" "net" - syncthingprotocol "github.com/syncthing/protocol" + syncthingprotocol "github.com/syncthing/syncthing/lib/protocol" ) const ( diff --git a/lib/relay/relay.go b/lib/relay/relay.go index 184190a03..514826e40 100644 --- a/lib/relay/relay.go +++ b/lib/relay/relay.go @@ -15,11 +15,11 @@ import ( "sort" "time" - "github.com/syncthing/relaysrv/client" - "github.com/syncthing/relaysrv/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/relay/client" + "github.com/syncthing/syncthing/lib/relay/protocol" "github.com/syncthing/syncthing/lib/sync" "github.com/thejerf/suture" diff --git a/lib/scanner/blockqueue.go b/lib/scanner/blockqueue.go index 1ab720ce2..9661c4d34 100644 --- a/lib/scanner/blockqueue.go +++ b/lib/scanner/blockqueue.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/scanner/blocks.go b/lib/scanner/blocks.go index 06178b113..c9051677b 100644 --- a/lib/scanner/blocks.go +++ b/lib/scanner/blocks.go @@ -13,7 +13,7 @@ import ( "io" "sync/atomic" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" ) var SHA256OfNothing = []uint8{0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55} diff --git a/lib/scanner/blocks_test.go b/lib/scanner/blocks_test.go index a52101b7d..9fe8981b2 100644 --- a/lib/scanner/blocks_test.go +++ b/lib/scanner/blocks_test.go @@ -11,7 +11,7 @@ import ( "fmt" "testing" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" ) var blocksTestData = []struct { diff --git a/lib/scanner/walk.go b/lib/scanner/walk.go index ef784d953..0cacc140d 100644 --- a/lib/scanner/walk.go +++ b/lib/scanner/walk.go @@ -16,10 +16,10 @@ import ( "time" "unicode/utf8" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/symlinks" "golang.org/x/text/unicode/norm" ) diff --git a/lib/scanner/walk_test.go b/lib/scanner/walk_test.go index 64c353094..45cc0e31b 100644 --- a/lib/scanner/walk_test.go +++ b/lib/scanner/walk_test.go @@ -17,9 +17,9 @@ import ( "sort" "testing" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/ignore" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/symlinks" "golang.org/x/text/unicode/norm" ) diff --git a/lib/symlinks/symlink_windows.go b/lib/symlinks/symlink_windows.go index 0a6a534ab..c40861502 100644 --- a/lib/symlinks/symlink_windows.go +++ b/lib/symlinks/symlink_windows.go @@ -12,8 +12,8 @@ import ( "os" "path/filepath" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "syscall" "unicode/utf16" diff --git a/test/filetype_test.go b/test/filetype_test.go index 9a558f46b..fcd61ed60 100644 --- a/test/filetype_test.go +++ b/test/filetype_test.go @@ -13,8 +13,8 @@ import ( "os" "testing" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rc" ) diff --git a/test/http_test.go b/test/http_test.go index 19574dba6..095f9dabd 100644 --- a/test/http_test.go +++ b/test/http_test.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - "github.com/syncthing/protocol" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rc" ) diff --git a/test/manypeers_test.go b/test/manypeers_test.go index 55f622301..9ae822f18 100644 --- a/test/manypeers_test.go +++ b/test/manypeers_test.go @@ -14,9 +14,9 @@ import ( "log" "testing" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rc" ) diff --git a/test/norestart_test.go b/test/norestart_test.go index 656942af2..ae21864fc 100644 --- a/test/norestart_test.go +++ b/test/norestart_test.go @@ -13,9 +13,9 @@ import ( "os" "testing" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rc" ) diff --git a/test/override_test.go b/test/override_test.go index 285b1e150..4076b8fb3 100644 --- a/test/override_test.go +++ b/test/override_test.go @@ -16,9 +16,9 @@ import ( "testing" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rc" ) diff --git a/test/symlink_test.go b/test/symlink_test.go index b23636423..635f8d8e9 100644 --- a/test/symlink_test.go +++ b/test/symlink_test.go @@ -15,8 +15,8 @@ import ( "path/filepath" "testing" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rc" "github.com/syncthing/syncthing/lib/symlinks" ) diff --git a/test/sync_test.go b/test/sync_test.go index 00de4a97c..c6e6da590 100644 --- a/test/sync_test.go +++ b/test/sync_test.go @@ -17,8 +17,8 @@ import ( "testing" "time" - "github.com/syncthing/protocol" "github.com/syncthing/syncthing/lib/config" + "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/rc" )