neofs: Add maxObjectSize as parameter in constructor

Signed-off-by: Evgenii Baidakov <[email protected]>
nspcc-dev · Aug 11, 2023 · cb7d1e5 · cb7d1e5
1 parent 99525d8
commit cb7d1e5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/cmd/s3-authmate/main.go b/cmd/s3-authmate/main.go
@@ -23,6 +23,7 @@ import (
 	"github.com/nspcc-dev/neofs-s3-gw/internal/neofs"
 	"github.com/nspcc-dev/neofs-s3-gw/internal/version"
 	"github.com/nspcc-dev/neofs-s3-gw/internal/wallet"
+	"github.com/nspcc-dev/neofs-sdk-go/client"
 	cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
 	"github.com/nspcc-dev/neofs-sdk-go/pool"
 	"github.com/nspcc-dev/neofs-sdk-go/user"
@@ -720,7 +721,12 @@ func createNeoFS(ctx context.Context, log *zap.Logger, cfg PoolConfig, anonSigne
 		return nil, fmt.Errorf("dial pool: %w", err)
 	}
 
-	neoFS := neofs.NewNeoFS(p, signer, anonSigner)
+	ni, err := p.NetworkInfo(ctx, client.PrmNetworkInfo{})
+	if err != nil {
+		return nil, fmt.Errorf("networkInfo: %w", err)
+	}
+
+	neoFS := neofs.NewNeoFS(p, signer, anonSigner, int64(ni.MaxObjectSize()))
 
 	return neofs.NewAuthmateNeoFS(neoFS), nil
 }
diff --git a/cmd/s3-gw/app.go b/cmd/s3-gw/app.go
@@ -25,6 +25,7 @@ import (
 	"github.com/nspcc-dev/neofs-s3-gw/internal/neofs"
 	"github.com/nspcc-dev/neofs-s3-gw/internal/version"
 	"github.com/nspcc-dev/neofs-s3-gw/internal/wallet"
+	"github.com/nspcc-dev/neofs-sdk-go/client"
 	"github.com/nspcc-dev/neofs-sdk-go/netmap"
 	"github.com/nspcc-dev/neofs-sdk-go/pool"
 	"github.com/nspcc-dev/neofs-sdk-go/stat"
@@ -100,7 +101,12 @@ func newApp(ctx context.Context, log *Logger, v *viper.Viper) *App {
 	anonSigner := user.NewAutoIDSignerRFC6979(anonKey.PrivateKey)
 	log.logger.Info("anonymous signer", zap.String("userID", anonSigner.UserID().String()))
 
-	neoFS := neofs.NewNeoFS(conns, signer, anonSigner)
+	ni, err := conns.NetworkInfo(ctx, client.PrmNetworkInfo{})
+	if err != nil {
+		log.logger.Fatal("newApp: networkInfo", zap.Error(err))
+	}
+
+	neoFS := neofs.NewNeoFS(conns, signer, anonSigner, int64(ni.MaxObjectSize()))
 
 	// prepare auth center
 	ctr := auth.New(neofs.NewAuthmateNeoFS(neoFS), key, v.GetStringSlice(cfgAllowedAccessKeyIDPrefixes), getAccessBoxCacheConfig(v, log.logger))
@@ -151,8 +157,13 @@ func (a *App) initLayer(ctx context.Context, anonSigner user.Signer) {
 
 	signer := user.NewAutoIDSignerRFC6979(a.gateKey.PrivateKey)
 
+	ni, err := a.pool.NetworkInfo(ctx, client.PrmNetworkInfo{})
+	if err != nil {
+		a.log.Fatal("initLayer: networkInfo", zap.Error(err))
+	}
+
 	// prepare object layer
-	a.obj = layer.NewLayer(a.log, neofs.NewNeoFS(a.pool, signer, anonSigner), layerCfg)
+	a.obj = layer.NewLayer(a.log, neofs.NewNeoFS(a.pool, signer, anonSigner, int64(ni.MaxObjectSize())), layerCfg)
 
 	if a.cfg.GetBool(cfgEnableNATS) {
 		nopts := getNotificationsOptions(a.cfg, a.log)

diff --git a/internal/neofs/neofs.go b/internal/neofs/neofs.go
@@ -34,17 +34,19 @@ import (
 // It is used to provide an interface to dependent packages
 // which work with NeoFS.
 type NeoFS struct {
-	pool       *pool.Pool
-	gateSigner user.Signer
-	anonSigner user.Signer
+	pool          *pool.Pool
+	gateSigner    user.Signer
+	anonSigner    user.Signer
+	maxObjectSize int64
 }
 
 // NewNeoFS creates new NeoFS using provided pool.Pool.
-func NewNeoFS(p *pool.Pool, signer user.Signer, anonSigner user.Signer) *NeoFS {
+func NewNeoFS(p *pool.Pool, signer user.Signer, anonSigner user.Signer, maxObjectSize int64) *NeoFS {
 	return &NeoFS{
-		pool:       p,
-		gateSigner: signer,
-		anonSigner: anonSigner,
+		pool:          p,
+		gateSigner:    signer,
+		anonSigner:    anonSigner,
+		maxObjectSize: maxObjectSize,
 	}
 }
 
@@ -214,11 +216,6 @@ func (x *NeoFS) DeleteContainer(ctx context.Context, id cid.ID, token *session.C
 
 // CreateObject implements neofs.NeoFS interface method.
 func (x *NeoFS) CreateObject(ctx context.Context, prm layer.PrmObjectCreate) (oid.ID, error) {
-	ni, err := x.pool.NetworkInfo(ctx, client.PrmNetworkInfo{})
-	if err != nil {
-		return oid.ID{}, fmt.Errorf("networkInfo: %w", err)
-	}
-
 	attrNum := len(prm.Attributes) + 1 // + creation time
 
 	if prm.Filepath != "" {
@@ -281,7 +278,7 @@ func (x *NeoFS) CreateObject(ctx context.Context, prm layer.PrmObjectCreate) (oi
 		return oid.ID{}, fmt.Errorf("save object via connection pool: %w", err)
 	}
 
-	chunk := make([]byte, ni.MaxObjectSize())
+	chunk := make([]byte, x.maxObjectSize)
 	_, err = io.CopyBuffer(writer, prm.Payload, chunk)
 	if err != nil {
 		return oid.ID{}, fmt.Errorf("read payload chunk: %w", err)