Убран лишний уровень вложенности

pkg/account/client/client.go → pkg/account/client.go

-package client
+package account
 
 import (
 	"context"
@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/account"
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
 	serviceMembers "git.perx.ru/perxis/perxis-go/pkg/members/middleware"
 	membersObserverTransport "git.perx.ru/perxis/perxis-go/pkg/members/observer/transport/grpc"
@@ -31,9 +30,9 @@ const (
 	DefaultCacheTTL  = time.Second * 10
 )
 
-func NewClient(ctx context.Context, addr string, opts ...Option) (*account.Account, *grpc.ClientConn, error) {
+func NewClient(ctx context.Context, addr string, opts ...Option) (*Account, *grpc.ClientConn, error) {
 
-	client := &account.Account{}
+	client := &Account{}
 	dialOpts := make([]grpc.DialOption, 0)
 	config := &config{}
 
@@ -118,7 +117,7 @@ func NewClient(ctx context.Context, addr string, opts ...Option) (*account.Accou
 	return client, accountConn, nil
 }
 
-func WithCaching(client *account.Account, size int, ttl time.Duration) *account.Account {
+func WithCaching(client *Account, size int, ttl time.Duration) *Account {
 	c := *client
 
 	c.Members = serviceMembers.CachingMiddleware(cache.NewCache(size, ttl))(client.Members)
@@ -128,7 +127,7 @@ func WithCaching(client *account.Account, size int, ttl time.Duration) *account.
 	return &c
 }
 
-func WithLogging(client *account.Account, logger *zap.Logger, accessLog bool) *account.Account {
+func WithLogging(client *Account, logger *zap.Logger, accessLog bool) *Account {
 	c := *client
 
 	c.Members = serviceMembers.WithLog(c.Members, logger, accessLog)

pkg/account/client/config.go → pkg/account/config.go

-package client
+package account
 
 import (
 	"github.com/go-kit/kit/transport/grpc"

pkg/content/client/client.go → pkg/content/client.go

-package client
+package content
 
 import (
 	"context"
@@ -16,7 +16,6 @@ import (
 	collaboratorsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport/grpc"
 	collectionsSvc "git.perx.ru/perxis/perxis-go/pkg/collections/middleware"
 	collectionsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collections/transport/grpc"
-	"git.perx.ru/perxis/perxis-go/pkg/content"
 	environmentsSvc "git.perx.ru/perxis/perxis-go/pkg/environments/middleware"
 	environmentsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/environments/transport/grpc"
 	invitationsSvc "git.perx.ru/perxis/perxis-go/pkg/invitations/middleware"
@@ -45,10 +44,10 @@ const (
 	DefaultCacheTTL  = time.Second * 10
 )
 
-func NewClient(addr string, opts ...Option) (*content.Content, *grpc.ClientConn, error) {
+func NewClient(addr string, opts ...Option) (*Content, *grpc.ClientConn, error) {
 	ctx := context.Background()
 
-	client := &content.Content{}
+	client := &Content{}
 	dialOpts := make([]grpc.DialOption, 0)
 	config := &Config{}
 
@@ -98,7 +97,7 @@ func NewClient(addr string, opts ...Option) (*content.Content, *grpc.ClientConn,
 	return client, contentConn, nil
 }
 
-func WithCaching(client *content.Content, size int, ttl time.Duration) *content.Content {
+func WithCaching(client *Content, size int, ttl time.Duration) *Content {
 	c := *client
 
 	c.Clients = clientsSvc.CachingMiddleware(cache.NewCache(size, ttl))(client.Clients)
@@ -114,7 +113,7 @@ func WithCaching(client *content.Content, size int, ttl time.Duration) *content.
 	return &c
 }
 
-func WithLogging(cs *content.Content, logger *zap.Logger, accessLog bool) *content.Content {
+func WithLogging(cs *Content, logger *zap.Logger, accessLog bool) *Content {
 	s := *cs
 
 	s.Collaborators = collaboratorsSvc.WithLog(s.Collaborators, logger, accessLog)

pkg/content/client/config.go → pkg/content/config.go

-package client
+package content
 
 import (
 	kitgrpc "github.com/go-kit/kit/transport/grpc"