layer: Remove gateSigner

Signed-off-by: Evgenii Baidakov <[email protected]>
nspcc-dev · Aug 11, 2023 · 4a66ae8 · 4a66ae8
1 parent 0775e3b
commit 4a66ae8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/api/layer/container.go b/api/layer/container.go
@@ -159,7 +159,7 @@ func (n *layer) createContainer(ctx context.Context, p *CreateBucketParams) (*da
 func (n *layer) setContainerEACLTable(ctx context.Context, idCnr cid.ID, table *eacl.Table, sessionToken *session.Container) error {
 	table.SetCID(idCnr)
 
-	return n.neoFS.SetContainerEACL(ctx, *table, sessionToken, n.gateSigner)
+	return n.neoFS.SetContainerEACL(ctx, *table, sessionToken)
 }
 
 func (n *layer) GetContainerEACL(ctx context.Context, idCnr cid.ID) (*eacl.Table, error) {

diff --git a/api/layer/layer.go b/api/layer/layer.go
@@ -40,9 +40,8 @@ type (
 	MsgHandlerFunc func(context.Context, *nats.Msg) error
 
 	layer struct {
-		neoFS      NeoFS
-		log        *zap.Logger
-		gateSigner user.Signer
+		neoFS NeoFS
+		log   *zap.Logger
 		// used in case of user wants to do something like anonymous.
 		// Typical using is a flag --no-sign-request in aws-cli.
 		anonymous   user.ID
@@ -265,7 +264,6 @@ func NewLayer(log *zap.Logger, neoFS NeoFS, config *Config) Client {
 	return &layer{
 		neoFS:       neoFS,
 		log:         log,
-		gateSigner:  user.NewAutoIDSignerRFC6979(config.GateKey.PrivateKey),
 		anonymous:   config.Anonymous,
 		resolver:    config.Resolver,
 		cache:       NewCache(config.Caches),
@@ -666,5 +664,5 @@ func (n *layer) DeleteBucket(ctx context.Context, p *DeleteBucketParams) error {
 	}
 
 	n.cache.DeleteBucket(p.BktInfo.Name)
-	return n.neoFS.DeleteContainer(ctx, p.BktInfo.CID, p.SessionToken, n.gateSigner)
+	return n.neoFS.DeleteContainer(ctx, p.BktInfo.CID, p.SessionToken)
 }
diff --git a/api/layer/neofs.go b/api/layer/neofs.go
@@ -155,7 +155,7 @@ type NeoFS interface {
 	// extended ACL is modified within session if session token is not nil.
 	//
 	// It returns any error encountered which prevented the eACL from being saved.
-	SetContainerEACL(context.Context, eacl.Table, *session.Container, user.Signer) error
+	SetContainerEACL(context.Context, eacl.Table, *session.Container) error
 
 	// ContainerEACL reads the container eACL from NeoFS by the container ID.
 	//
@@ -168,7 +168,7 @@ type NeoFS interface {
 	// Successful return does not guarantee actual removal.
 	//
 	// It returns any error encountered which prevented the removal request from being sent.
-	DeleteContainer(context.Context, cid.ID, *session.Container, user.Signer) error
+	DeleteContainer(context.Context, cid.ID, *session.Container) error
 
 	// ReadObject reads a part of the object from the NeoFS container by identifier.
 	// Exact part is returned according to the parameters:

diff --git a/api/layer/neofs_mock.go b/api/layer/neofs_mock.go
@@ -105,7 +105,7 @@ func (t *TestNeoFS) CreateContainer(_ context.Context, prm PrmContainerCreate) (
 	return id, nil
 }
 
-func (t *TestNeoFS) DeleteContainer(_ context.Context, cnrID cid.ID, _ *session.Container, _ user.Signer) error {
+func (t *TestNeoFS) DeleteContainer(_ context.Context, cnrID cid.ID, _ *session.Container) error {
 	delete(t.containers, cnrID.EncodeToString())
 
 	return nil
@@ -257,7 +257,7 @@ func (t *TestNeoFS) AllObjects(cnrID cid.ID) []oid.ID {
 	return result
 }
 
-func (t *TestNeoFS) SetContainerEACL(_ context.Context, table eacl.Table, _ *session.Container, _ user.Signer) error {
+func (t *TestNeoFS) SetContainerEACL(_ context.Context, table eacl.Table, _ *session.Container) error {
 	cnrID, ok := table.CID()
 	if !ok {
 		return errors.New("invalid cid")

diff --git a/internal/neofs/neofs.go b/internal/neofs/neofs.go
@@ -159,14 +159,14 @@ func (x *NeoFS) UserContainers(ctx context.Context, id user.ID) ([]cid.ID, error
 }
 
 // SetContainerEACL implements neofs.NeoFS interface method.
-func (x *NeoFS) SetContainerEACL(ctx context.Context, table eacl.Table, sessionToken *session.Container, signer user.Signer) error {
+func (x *NeoFS) SetContainerEACL(ctx context.Context, table eacl.Table, sessionToken *session.Container) error {
 	var prm client.PrmContainerSetEACL
 	if sessionToken != nil {
 		prm.WithinSession(*sessionToken)
 	}
 
 	eaclWaiter := waiter.NewContainerSetEACLWaiter(x.pool, waiter.DefaultPollInterval)
-	err := eaclWaiter.ContainerSetEACL(ctx, table, signer, prm)
+	err := eaclWaiter.ContainerSetEACL(ctx, table, x.gateSigner, prm)
 	if err != nil {
 		return fmt.Errorf("save eACL via connection pool: %w", err)
 	}
@@ -186,14 +186,14 @@ func (x *NeoFS) ContainerEACL(ctx context.Context, id cid.ID) (*eacl.Table, erro
 }
 
 // DeleteContainer implements neofs.NeoFS interface method.
-func (x *NeoFS) DeleteContainer(ctx context.Context, id cid.ID, token *session.Container, signer user.Signer) error {
+func (x *NeoFS) DeleteContainer(ctx context.Context, id cid.ID, token *session.Container) error {
 	var prm client.PrmContainerDelete
 	if token != nil {
 		prm.WithinSession(*token)
 	}
 
 	deleteWaiter := waiter.NewContainerDeleteWaiter(x.pool, waiter.DefaultPollInterval)
-	err := deleteWaiter.ContainerDelete(ctx, id, signer, prm)
+	err := deleteWaiter.ContainerDelete(ctx, id, x.gateSigner, prm)
 	if err != nil {
 		return fmt.Errorf("delete container via connection pool: %w", err)
 	}