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

@@ -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;\''

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/private/revocation"
-	"storj.io/storj/pkg/server"
+	"storj.io/storj/private/server"
 )
 
 var (

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.

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.
 )
 

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() {

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 (

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"
 )

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 (

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"

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"

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/private/lrucache"
-	"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/satellite"
 	"storj.io/storj/satellite/accounting"

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"

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"

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"

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.

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"
 )

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

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"
 )
 

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.

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.

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"

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/private/revocation"
-	"storj.io/storj/pkg/server"
+	"storj.io/storj/private/server"
 	"storj.io/storj/private/testredis"
 	versionchecker "storj.io/storj/private/version/checker"
 	"storj.io/storj/private/web"

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/private/revocation"
-	"storj.io/storj/pkg/server"
+	"storj.io/storj/private/server"
 	"storj.io/storj/storage/filestore"
 	"storj.io/storj/storagenode"
 	"storj.io/storj/storagenode/bandwidth"

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/private/revocation"
-	"storj.io/storj/pkg/server"
+	"storj.io/storj/private/server"
 	"storj.io/storj/private/testplanet"
 	"storj.io/uplink"
 	"storj.io/uplink/private/metainfo"

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"
 )

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 (

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"

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"
 )
 

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"

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"

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"
 )

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"
 )

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"

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"
 )
 

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"

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"