From 7802ab714f0ba0cdc34abdafa32556f27129ff58 Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Fri, 23 Apr 2021 16:13:51 +0300 Subject: [PATCH] pkg/,private/: merge with private package Initially there were pkg and private packages, however for all practical purposes there's no significant difference between them. It's clearer to have a single private package - and when we do get a specific abstraction that needs to be reused, we can move it to storj.io/common or storj.io/private. Change-Id: Ibc2036e67f312f5d63cb4a97f5a92e38ae413aa5 --- Jenkinsfile.public | 2 +- certificate/peer.go | 4 ++-- certificate/peer_test.go | 2 +- cmd/certificates/main.go | 2 +- cmd/connect-test/connecttest.go | 2 +- cmd/identity/certificate_authority.go | 2 +- cmd/identity/main.go | 2 +- cmd/identity/revocations.go | 2 +- cmd/satellite/api.go | 2 +- cmd/satellite/gc.go | 2 +- cmd/satellite/main.go | 4 ++-- cmd/satellite/repairer.go | 2 +- cmd/storagenode/main.go | 2 +- cmd/uplink/cmd/root.go | 2 +- {pkg => private}/lrucache/cache.go | 0 {pkg => private}/lrucache/cache_test.go | 0 {pkg => private}/quic/common.go | 0 {pkg => private}/quic/conn.go | 2 +- {pkg => private}/quic/connector.go | 0 {pkg => private}/quic/listener.go | 0 {pkg => private}/quic/qtls/go114.go | 0 {pkg => private}/quic/qtls/go115.go | 0 {pkg => private}/revocation/common.go | 0 {pkg => private}/revocation/db.go | 0 {pkg => private}/revocation/db_test.go | 0 {pkg => private}/revocation/extensions_test.go | 0 {pkg => private}/revocation/tlsopts_test.go | 2 +- {pkg => private}/server/common.go | 0 {pkg => private}/server/connector.go | 2 +- {pkg => private}/server/connector_test.go | 2 +- {pkg => private}/server/listener.go | 2 +- {pkg => private}/server/server.go | 2 +- private/testplanet/rpc_test.go | 2 +- private/testplanet/satellite.go | 4 ++-- private/testplanet/storagenode.go | 4 ++-- private/testplanet/uplink_test.go | 4 ++-- private/testrevocation/db.go | 2 +- satellite/accounting/projectlimitcache.go | 2 +- satellite/api.go | 2 +- satellite/contact/service.go | 2 +- satellite/metainfo/metainfo.go | 2 +- satellite/peer.go | 2 +- satellite/satellitedb/apikeys.go | 2 +- satellite/satellitedb/consoledb.go | 2 +- satellite/satellitedb/database.go | 2 +- satellite/satellitedb/revocation.go | 2 +- storagenode/peer.go | 2 +- storagenode/preflight/localtime_test.go | 2 +- 48 files changed, 41 insertions(+), 41 deletions(-) rename {pkg => private}/lrucache/cache.go (100%) rename {pkg => private}/lrucache/cache_test.go (100%) rename {pkg => private}/quic/common.go (100%) rename {pkg => private}/quic/conn.go (99%) rename {pkg => private}/quic/connector.go (100%) rename {pkg => private}/quic/listener.go (100%) rename {pkg => private}/quic/qtls/go114.go (100%) rename {pkg => private}/quic/qtls/go115.go (100%) rename {pkg => private}/revocation/common.go (100%) rename {pkg => private}/revocation/db.go (100%) rename {pkg => private}/revocation/db_test.go (100%) rename {pkg => private}/revocation/extensions_test.go (100%) rename {pkg => private}/revocation/tlsopts_test.go (99%) rename {pkg => private}/server/common.go (100%) rename {pkg => private}/server/connector.go (99%) rename {pkg => private}/server/connector_test.go (98%) rename {pkg => private}/server/listener.go (98%) rename {pkg => private}/server/server.go (99%) diff --git a/Jenkinsfile.public b/Jenkinsfile.public index 29d242fa9..7474a9a51 100644 --- a/Jenkinsfile.public +++ b/Jenkinsfile.public @@ -72,7 +72,7 @@ pipeline { STORJ_TEST_COCKROACH_ALT = 'cockroach://root@localhost:26260/testcockroach?sslmode=disable' STORJ_TEST_POSTGRES = 'postgres://postgres@localhost/teststorj?sslmode=disable' STORJ_TEST_DATABASES = 'crdb|pgx|cockroach://root@localhost:26259/testmetabase?sslmode=disable;pg|pgx|postgres://postgres@localhost/testmetabase?sslmode=disable' - COVERFLAGS = "${ env.BRANCH_NAME == 'main' ? '-coverprofile=.build/coverprofile -coverpkg=storj.io/storj/private/...,storj.io/storj/pkg/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/versioncontrol/...' : ''}" + COVERFLAGS = "${ env.BRANCH_NAME == 'main' ? '-coverprofile=.build/coverprofile -coverpkg=storj.io/storj/private/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/versioncontrol/...' : ''}" } steps { sh 'cockroach sql --insecure --host=localhost:26256 -e \'create database testcockroach;\'' diff --git a/certificate/peer.go b/certificate/peer.go index 3ad820bff..78eb351a7 100644 --- a/certificate/peer.go +++ b/certificate/peer.go @@ -17,8 +17,8 @@ import ( "storj.io/common/peertls/tlsopts" "storj.io/storj/certificate/authorization" "storj.io/storj/certificate/certificatepb" - "storj.io/storj/pkg/revocation" - "storj.io/storj/pkg/server" + "storj.io/storj/private/revocation" + "storj.io/storj/private/server" ) var ( diff --git a/certificate/peer_test.go b/certificate/peer_test.go index 258486dc7..173bc822d 100644 --- a/certificate/peer_test.go +++ b/certificate/peer_test.go @@ -26,7 +26,7 @@ import ( "storj.io/storj/certificate/authorization" "storj.io/storj/certificate/certificateclient" "storj.io/storj/certificate/certificatepb" - "storj.io/storj/pkg/server" + "storj.io/storj/private/server" ) // TODO: test sad path. diff --git a/cmd/certificates/main.go b/cmd/certificates/main.go index da7c0091a..d774aaba8 100644 --- a/cmd/certificates/main.go +++ b/cmd/certificates/main.go @@ -13,7 +13,7 @@ import ( "storj.io/private/process" "storj.io/storj/certificate" "storj.io/storj/certificate/authorization" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" _ "storj.io/storj/private/version" // This attaches version information during release builds. ) diff --git a/cmd/connect-test/connecttest.go b/cmd/connect-test/connecttest.go index 339609578..325083214 100644 --- a/cmd/connect-test/connecttest.go +++ b/cmd/connect-test/connecttest.go @@ -16,7 +16,7 @@ import ( "storj.io/common/peertls/tlsopts" "storj.io/common/rpc" "storj.io/common/storj" - "storj.io/storj/pkg/quic" + "storj.io/storj/private/quic" ) func main() { diff --git a/cmd/identity/certificate_authority.go b/cmd/identity/certificate_authority.go index 57afa0ee8..8573a6c2b 100644 --- a/cmd/identity/certificate_authority.go +++ b/cmd/identity/certificate_authority.go @@ -15,7 +15,7 @@ import ( "storj.io/common/peertls/extensions" "storj.io/private/cfgstruct" "storj.io/private/process" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" ) var ( diff --git a/cmd/identity/main.go b/cmd/identity/main.go index e48e5e30f..0b8ce8abd 100644 --- a/cmd/identity/main.go +++ b/cmd/identity/main.go @@ -24,7 +24,7 @@ import ( "storj.io/private/process" "storj.io/private/version" "storj.io/storj/certificate/certificateclient" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" _ "storj.io/storj/private/version" // This attaches version information during release builds. "storj.io/storj/private/version/checker" ) diff --git a/cmd/identity/revocations.go b/cmd/identity/revocations.go index 88522bf62..d28aa85a0 100644 --- a/cmd/identity/revocations.go +++ b/cmd/identity/revocations.go @@ -14,7 +14,7 @@ import ( "storj.io/private/cfgstruct" "storj.io/private/process" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" ) var ( diff --git a/cmd/satellite/api.go b/cmd/satellite/api.go index 23b0ac3ec..e7352af2e 100644 --- a/cmd/satellite/api.go +++ b/cmd/satellite/api.go @@ -11,7 +11,7 @@ import ( "storj.io/common/context2" "storj.io/private/process" "storj.io/private/version" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" "storj.io/storj/satellite" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting/live" diff --git a/cmd/satellite/gc.go b/cmd/satellite/gc.go index fe55a00cf..c3a4fec27 100644 --- a/cmd/satellite/gc.go +++ b/cmd/satellite/gc.go @@ -10,7 +10,7 @@ import ( "storj.io/private/process" "storj.io/private/version" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" "storj.io/storj/satellite" "storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/satellitedb" diff --git a/cmd/satellite/main.go b/cmd/satellite/main.go index 325344502..8be38f741 100644 --- a/cmd/satellite/main.go +++ b/cmd/satellite/main.go @@ -30,8 +30,8 @@ import ( _ "storj.io/private/process/googleprofiler" // This attaches google cloud profiler. "storj.io/private/version" "storj.io/storj/cmd/satellite/reports" - "storj.io/storj/pkg/lrucache" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/lrucache" + "storj.io/storj/private/revocation" _ "storj.io/storj/private/version" // This attaches version information during release builds. "storj.io/storj/satellite" "storj.io/storj/satellite/accounting" diff --git a/cmd/satellite/repairer.go b/cmd/satellite/repairer.go index 1daa809af..417a15b3b 100644 --- a/cmd/satellite/repairer.go +++ b/cmd/satellite/repairer.go @@ -12,7 +12,7 @@ import ( "storj.io/common/errs2" "storj.io/private/process" "storj.io/private/version" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" "storj.io/storj/satellite" "storj.io/storj/satellite/metainfo" "storj.io/storj/satellite/orders" diff --git a/cmd/storagenode/main.go b/cmd/storagenode/main.go index fe6d78398..522a9a347 100644 --- a/cmd/storagenode/main.go +++ b/cmd/storagenode/main.go @@ -21,7 +21,7 @@ import ( "storj.io/private/cfgstruct" "storj.io/private/process" "storj.io/private/version" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" _ "storj.io/storj/private/version" // This attaches version information during release builds. "storj.io/storj/storagenode" "storj.io/storj/storagenode/apikeys" diff --git a/cmd/uplink/cmd/root.go b/cmd/uplink/cmd/root.go index 2cb22a029..6c8583546 100644 --- a/cmd/uplink/cmd/root.go +++ b/cmd/uplink/cmd/root.go @@ -24,7 +24,7 @@ import ( "storj.io/common/storj" "storj.io/private/cfgstruct" "storj.io/private/process" - "storj.io/storj/pkg/server" + "storj.io/storj/private/server" "storj.io/storj/private/version/checker" "storj.io/uplink" privateAccess "storj.io/uplink/private/access" diff --git a/pkg/lrucache/cache.go b/private/lrucache/cache.go similarity index 100% rename from pkg/lrucache/cache.go rename to private/lrucache/cache.go diff --git a/pkg/lrucache/cache_test.go b/private/lrucache/cache_test.go similarity index 100% rename from pkg/lrucache/cache_test.go rename to private/lrucache/cache_test.go diff --git a/pkg/quic/common.go b/private/quic/common.go similarity index 100% rename from pkg/quic/common.go rename to private/quic/common.go diff --git a/pkg/quic/conn.go b/private/quic/conn.go similarity index 99% rename from pkg/quic/conn.go rename to private/quic/conn.go index f7faf7947..16a3d6acf 100644 --- a/pkg/quic/conn.go +++ b/private/quic/conn.go @@ -17,7 +17,7 @@ import ( "storj.io/common/memory" "storj.io/common/rpc" - "storj.io/storj/pkg/quic/qtls" + "storj.io/storj/private/quic/qtls" ) // Conn is a wrapper around a quic connection and fulfills net.Conn interface. diff --git a/pkg/quic/connector.go b/private/quic/connector.go similarity index 100% rename from pkg/quic/connector.go rename to private/quic/connector.go diff --git a/pkg/quic/listener.go b/private/quic/listener.go similarity index 100% rename from pkg/quic/listener.go rename to private/quic/listener.go diff --git a/pkg/quic/qtls/go114.go b/private/quic/qtls/go114.go similarity index 100% rename from pkg/quic/qtls/go114.go rename to private/quic/qtls/go114.go diff --git a/pkg/quic/qtls/go115.go b/private/quic/qtls/go115.go similarity index 100% rename from pkg/quic/qtls/go115.go rename to private/quic/qtls/go115.go diff --git a/pkg/revocation/common.go b/private/revocation/common.go similarity index 100% rename from pkg/revocation/common.go rename to private/revocation/common.go diff --git a/pkg/revocation/db.go b/private/revocation/db.go similarity index 100% rename from pkg/revocation/db.go rename to private/revocation/db.go diff --git a/pkg/revocation/db_test.go b/private/revocation/db_test.go similarity index 100% rename from pkg/revocation/db_test.go rename to private/revocation/db_test.go diff --git a/pkg/revocation/extensions_test.go b/private/revocation/extensions_test.go similarity index 100% rename from pkg/revocation/extensions_test.go rename to private/revocation/extensions_test.go diff --git a/pkg/revocation/tlsopts_test.go b/private/revocation/tlsopts_test.go similarity index 99% rename from pkg/revocation/tlsopts_test.go rename to private/revocation/tlsopts_test.go index eedf2ac37..137e2dbac 100644 --- a/pkg/revocation/tlsopts_test.go +++ b/private/revocation/tlsopts_test.go @@ -21,7 +21,7 @@ import ( "storj.io/common/peertls/tlsopts" "storj.io/common/storj" "storj.io/common/testcontext" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" "storj.io/storj/private/testrevocation" "storj.io/storj/storage" ) diff --git a/pkg/server/common.go b/private/server/common.go similarity index 100% rename from pkg/server/common.go rename to private/server/common.go diff --git a/pkg/server/connector.go b/private/server/connector.go similarity index 99% rename from pkg/server/connector.go rename to private/server/connector.go index 87c0e3f52..f8d683ef2 100644 --- a/pkg/server/connector.go +++ b/private/server/connector.go @@ -11,7 +11,7 @@ import ( "storj.io/common/memory" "storj.io/common/rpc" - "storj.io/storj/pkg/quic" + "storj.io/storj/private/quic" ) // HybridConnector implements a dialer that creates a connection using either diff --git a/pkg/server/connector_test.go b/private/server/connector_test.go similarity index 98% rename from pkg/server/connector_test.go rename to private/server/connector_test.go index 9109520dc..07419eacb 100644 --- a/pkg/server/connector_test.go +++ b/private/server/connector_test.go @@ -12,7 +12,7 @@ import ( "storj.io/common/peertls/tlsopts" "storj.io/common/storj" "storj.io/common/testcontext" - "storj.io/storj/pkg/server" + "storj.io/storj/private/server" "storj.io/storj/private/testplanet" ) diff --git a/pkg/server/listener.go b/private/server/listener.go similarity index 98% rename from pkg/server/listener.go rename to private/server/listener.go index da04fff21..b2436c597 100644 --- a/pkg/server/listener.go +++ b/private/server/listener.go @@ -12,7 +12,7 @@ import ( "storj.io/common/netutil" "storj.io/common/rpc" - "storj.io/storj/pkg/quic" + "storj.io/storj/private/quic" ) // defaultUserTimeout is the value we use for the TCP_USER_TIMEOUT setting. diff --git a/pkg/server/server.go b/private/server/server.go similarity index 99% rename from pkg/server/server.go rename to private/server/server.go index c5827fb48..5dc5e53b9 100644 --- a/pkg/server/server.go +++ b/private/server/server.go @@ -25,7 +25,7 @@ import ( "storj.io/drpc/drpcmux" "storj.io/drpc/drpcserver" jaeger "storj.io/monkit-jaeger" - "storj.io/storj/pkg/quic" + "storj.io/storj/private/quic" ) // Config holds server specific configuration parameters. diff --git a/private/testplanet/rpc_test.go b/private/testplanet/rpc_test.go index ad14533c6..4c3c8b3cf 100644 --- a/private/testplanet/rpc_test.go +++ b/private/testplanet/rpc_test.go @@ -18,7 +18,7 @@ import ( "storj.io/common/rpc" "storj.io/common/storj" "storj.io/common/testcontext" - "storj.io/storj/pkg/quic" + "storj.io/storj/private/quic" "storj.io/storj/private/testplanet" "storj.io/storj/satellite" "storj.io/storj/storagenode" diff --git a/private/testplanet/satellite.go b/private/testplanet/satellite.go index b54c3d9a9..bb9af21de 100644 --- a/private/testplanet/satellite.go +++ b/private/testplanet/satellite.go @@ -26,8 +26,8 @@ import ( "storj.io/common/uuid" "storj.io/private/debug" "storj.io/private/version" - "storj.io/storj/pkg/revocation" - "storj.io/storj/pkg/server" + "storj.io/storj/private/revocation" + "storj.io/storj/private/server" "storj.io/storj/private/testredis" versionchecker "storj.io/storj/private/version/checker" "storj.io/storj/private/web" diff --git a/private/testplanet/storagenode.go b/private/testplanet/storagenode.go index 0be40c85e..794d0dc64 100644 --- a/private/testplanet/storagenode.go +++ b/private/testplanet/storagenode.go @@ -21,8 +21,8 @@ import ( "storj.io/common/peertls/tlsopts" "storj.io/common/storj" "storj.io/private/debug" - "storj.io/storj/pkg/revocation" - "storj.io/storj/pkg/server" + "storj.io/storj/private/revocation" + "storj.io/storj/private/server" "storj.io/storj/storage/filestore" "storj.io/storj/storagenode" "storj.io/storj/storagenode/bandwidth" diff --git a/private/testplanet/uplink_test.go b/private/testplanet/uplink_test.go index 99cd182ac..2fedc9289 100644 --- a/private/testplanet/uplink_test.go +++ b/private/testplanet/uplink_test.go @@ -23,8 +23,8 @@ import ( "storj.io/common/storj" "storj.io/common/testcontext" "storj.io/common/testrand" - "storj.io/storj/pkg/revocation" - "storj.io/storj/pkg/server" + "storj.io/storj/private/revocation" + "storj.io/storj/private/server" "storj.io/storj/private/testplanet" "storj.io/uplink" "storj.io/uplink/private/metainfo" diff --git a/private/testrevocation/db.go b/private/testrevocation/db.go index 17bbd9a5e..93dd1326e 100644 --- a/private/testrevocation/db.go +++ b/private/testrevocation/db.go @@ -10,7 +10,7 @@ import ( "storj.io/common/peertls/extensions" "storj.io/common/testcontext" - "storj.io/storj/pkg/revocation" + "storj.io/storj/private/revocation" "storj.io/storj/private/testredis" "storj.io/storj/storage" ) diff --git a/satellite/accounting/projectlimitcache.go b/satellite/accounting/projectlimitcache.go index 3d4fb3d03..368b4ca64 100644 --- a/satellite/accounting/projectlimitcache.go +++ b/satellite/accounting/projectlimitcache.go @@ -11,7 +11,7 @@ import ( "storj.io/common/memory" "storj.io/common/uuid" - "storj.io/storj/pkg/lrucache" + "storj.io/storj/private/lrucache" ) var ( diff --git a/satellite/api.go b/satellite/api.go index f6d9fc67f..1d07d8931 100644 --- a/satellite/api.go +++ b/satellite/api.go @@ -25,10 +25,10 @@ import ( "storj.io/common/storj" "storj.io/private/debug" "storj.io/private/version" - "storj.io/storj/pkg/server" "storj.io/storj/private/lifecycle" "storj.io/storj/private/post" "storj.io/storj/private/post/oauth2" + "storj.io/storj/private/server" "storj.io/storj/private/version/checker" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/analytics" diff --git a/satellite/contact/service.go b/satellite/contact/service.go index 99e67c693..41addf8f5 100644 --- a/satellite/contact/service.go +++ b/satellite/contact/service.go @@ -16,7 +16,7 @@ import ( "storj.io/common/rpc" "storj.io/common/rpc/rpcstatus" "storj.io/common/storj" - "storj.io/storj/pkg/quic" + "storj.io/storj/private/quic" "storj.io/storj/satellite/overlay" ) diff --git a/satellite/metainfo/metainfo.go b/satellite/metainfo/metainfo.go index af47b6d08..1eb57fd6d 100644 --- a/satellite/metainfo/metainfo.go +++ b/satellite/metainfo/metainfo.go @@ -22,7 +22,7 @@ import ( "storj.io/common/signing" "storj.io/common/storj" "storj.io/common/uuid" - "storj.io/storj/pkg/lrucache" + "storj.io/storj/private/lrucache" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/attribution" "storj.io/storj/satellite/console" diff --git a/satellite/peer.go b/satellite/peer.go index 7b2b15249..6a4dd3cf7 100644 --- a/satellite/peer.go +++ b/satellite/peer.go @@ -11,7 +11,7 @@ import ( "storj.io/common/identity" "storj.io/private/debug" - "storj.io/storj/pkg/server" + "storj.io/storj/private/server" version_checker "storj.io/storj/private/version/checker" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/accounting/live" diff --git a/satellite/satellitedb/apikeys.go b/satellite/satellitedb/apikeys.go index 98d92d3af..50865b2f1 100644 --- a/satellite/satellitedb/apikeys.go +++ b/satellite/satellitedb/apikeys.go @@ -10,7 +10,7 @@ import ( "github.com/zeebo/errs" "storj.io/common/uuid" - "storj.io/storj/pkg/lrucache" + "storj.io/storj/private/lrucache" "storj.io/storj/satellite/console" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/satellite/satellitedb/consoledb.go b/satellite/satellitedb/consoledb.go index 256784e2e..6ff086a77 100644 --- a/satellite/satellitedb/consoledb.go +++ b/satellite/satellitedb/consoledb.go @@ -9,7 +9,7 @@ import ( "github.com/zeebo/errs" - "storj.io/storj/pkg/lrucache" + "storj.io/storj/private/lrucache" "storj.io/storj/satellite/console" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/satellite/satellitedb/database.go b/satellite/satellitedb/database.go index 5d0530fb0..34e06ca9a 100644 --- a/satellite/satellitedb/database.go +++ b/satellite/satellitedb/database.go @@ -14,7 +14,7 @@ import ( "storj.io/private/dbutil" "storj.io/private/dbutil/pgutil" "storj.io/private/tagsql" - "storj.io/storj/pkg/lrucache" + "storj.io/storj/private/lrucache" "storj.io/storj/private/migrate" "storj.io/storj/satellite" "storj.io/storj/satellite/accounting" diff --git a/satellite/satellitedb/revocation.go b/satellite/satellitedb/revocation.go index 9c4ff62fa..640c9e9e3 100644 --- a/satellite/satellitedb/revocation.go +++ b/satellite/satellitedb/revocation.go @@ -9,7 +9,7 @@ import ( "github.com/zeebo/errs" - "storj.io/storj/pkg/lrucache" + "storj.io/storj/private/lrucache" "storj.io/storj/satellite/satellitedb/dbx" ) diff --git a/storagenode/peer.go b/storagenode/peer.go index e0358e811..615f9e268 100644 --- a/storagenode/peer.go +++ b/storagenode/peer.go @@ -26,9 +26,9 @@ import ( "storj.io/common/storj" "storj.io/private/debug" "storj.io/private/version" - "storj.io/storj/pkg/server" "storj.io/storj/private/lifecycle" "storj.io/storj/private/multinodepb" + "storj.io/storj/private/server" "storj.io/storj/private/version/checker" "storj.io/storj/storage" "storj.io/storj/storage/filestore" diff --git a/storagenode/preflight/localtime_test.go b/storagenode/preflight/localtime_test.go index f37efe90e..04c98bd6c 100644 --- a/storagenode/preflight/localtime_test.go +++ b/storagenode/preflight/localtime_test.go @@ -20,7 +20,7 @@ import ( "storj.io/common/peertls/tlsopts" "storj.io/common/rpc" "storj.io/common/testcontext" - "storj.io/storj/pkg/server" + "storj.io/storj/private/server" "storj.io/storj/private/testplanet" "storj.io/storj/storagenode" "storj.io/storj/storagenode/preflight"