ir/container: De-struct method parameters

Passing explicit parameters is easier to understand.

Signed-off-by: Leonard Lyubich <leonard@morphbits.io>

Author: cthulhu-rider

pkg/innerring/processors/container/process_container.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/nspcc-dev/neo-go/pkg/core/transaction"
 	"github.com/nspcc-dev/neo-go/pkg/network/payload"
 	"github.com/nspcc-dev/neofs-node/pkg/morph/event"
 	containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container"
@@ -24,13 +25,6 @@ type putEvent interface {
 	NotaryRequest() *payload.P2PNotaryRequest
 }
 
-type putContainerContext struct {
-	e containerEvent.CreateContainerRequest
-
-	// must be filled when verifying raw data from e
-	cnr containerSDK.Container
-}
-
 // Process a new container from the user by checking the container sanity
 // and sending approve tx back to the FS chain.
 func (cp *Processor) processContainerPut(req containerEvent.CreateContainerRequest, id cid.ID) {
@@ -39,11 +33,15 @@ func (cp *Processor) processContainerPut(req containerEvent.CreateContainerReque
 		return
 	}
 
-	ctx := &putContainerContext{
-		e: req,
+	var cnr containerSDK.Container
+	if err := cnr.Unmarshal(req.Container); err != nil {
+		cp.log.Error("put container check failed",
+			zap.Error(fmt.Errorf("invalid binary container: %w", err)),
+		)
+		return
 	}
 
-	err := cp.checkPutContainer(ctx)
+	err := cp.checkPutContainer(req, cnr)
 	if err != nil {
 		cp.log.Error("put container check failed",
 			zap.Error(err),
@@ -52,7 +50,7 @@ func (cp *Processor) processContainerPut(req containerEvent.CreateContainerReque
 		return
 	}
 
-	cp.approvePutContainer(ctx, id)
+	cp.approvePutContainer(req.MainTransaction, cnr, id)
 }
 
 const (
@@ -67,15 +65,8 @@ var allowedSystemAttributes = map[string]struct{}{
 	sysAttrChainMeta:                              {},
 }
 
-func (cp *Processor) checkPutContainer(ctx *putContainerContext) error {
-	binCnr := ctx.e.Container
-
-	err := ctx.cnr.Unmarshal(binCnr)
-	if err != nil {
-		return fmt.Errorf("invalid binary container: %w", err)
-	}
-
-	for k := range ctx.cnr.Attributes() {
+func (cp *Processor) checkPutContainer(req containerEvent.CreateContainerRequest, cnr containerSDK.Container) error {
+	for k := range cnr.Attributes() {
 		if strings.HasPrefix(k, sysAttrPrefix) {
 			if _, ok := allowedSystemAttributes[k]; !ok {
 				return fmt.Errorf("system attribute %s is not allowed", k)
@@ -87,38 +78,38 @@ func (cp *Processor) checkPutContainer(ctx *putContainerContext) error {
 		}
 	}
 
-	ecRules := ctx.cnr.PlacementPolicy().ECRules()
+	ecRules := cnr.PlacementPolicy().ECRules()
 	if !cp.allowEC && len(ecRules) > 0 {
 		return errors.New("EC rules are not supported yet")
 	}
-	if len(ecRules) > 0 && ctx.cnr.PlacementPolicy().NumberOfReplicas() > 0 {
+	if len(ecRules) > 0 && cnr.PlacementPolicy().NumberOfReplicas() > 0 {
 		return errors.New("REP+EC rules are not supported yet")
 	}
 
-	err = cp.verifySignature(signatureVerificationData{
-		ownerContainer:  ctx.cnr.Owner(),
+	err := cp.verifySignature(signatureVerificationData{
+		ownerContainer:  cnr.Owner(),
 		verb:            session.VerbContainerPut,
-		binTokenSession: ctx.e.SessionToken,
-		verifScript:     ctx.e.VerificationScript,
-		invocScript:     ctx.e.InvocationScript,
-		signedData:      binCnr,
+		binTokenSession: req.SessionToken,
+		verifScript:     req.VerificationScript,
+		invocScript:     req.InvocationScript,
+		signedData:      req.Container,
 	})
 	if err != nil {
 		return fmt.Errorf("auth container creation: %w", err)
 	}
 
-	if err = ctx.cnr.PlacementPolicy().Verify(); err != nil {
+	if err = cnr.PlacementPolicy().Verify(); err != nil {
 		return fmt.Errorf("invalid storage policy: %w", err)
 	}
 
 	// check homomorphic hashing setting
-	err = checkHomomorphicHashing(cp.netState, ctx.cnr)
+	err = checkHomomorphicHashing(cp.netState, cnr)
 	if err != nil {
 		return fmt.Errorf("incorrect homomorphic hashing setting: %w", err)
 	}
 
-	if ctx.e.DomainName != "" { // if PutNamed event => check if values in-container domain name and zone correspond to args
-		err = checkNNS(ctx.cnr, ctx.e.DomainName, ctx.e.DomainZone)
+	if req.DomainName != "" { // if PutNamed event => check if values in-container domain name and zone correspond to args
+		err = checkNNS(cnr, req.DomainName, req.DomainZone)
 		if err != nil {
 			return fmt.Errorf("NNS: %w", err)
 		}
@@ -127,15 +118,13 @@ func (cp *Processor) checkPutContainer(ctx *putContainerContext) error {
 	return nil
 }
 
-func (cp *Processor) approvePutContainer(ctx *putContainerContext, id cid.ID) {
+func (cp *Processor) approvePutContainer(mainTx transaction.Transaction, cnr containerSDK.Container, id cid.ID) {
 	l := cp.log.With(zap.Stringer("cID", id))
 	l.Debug("approving new container...")
 
-	e := ctx.e
-
 	var err error
 
-	err = cp.cnrClient.Morph().NotarySignAndInvokeTX(&e.MainTransaction, true)
+	err = cp.cnrClient.Morph().NotarySignAndInvokeTX(&mainTx, true)
 
 	if err != nil {
 		l.Error("could not approve put container",
@@ -150,7 +139,7 @@ func (cp *Processor) approvePutContainer(ctx *putContainerContext, id cid.ID) {
 		return
 	}
 
-	policy := ctx.cnr.PlacementPolicy()
+	policy := cnr.PlacementPolicy()
 	vectors, err := nm.ContainerNodes(policy, id)
 	if err != nil {
 		l.Error("could not build placement for Container contract update", zap.Error(err))