Org-wide linter

.github/workflows/go.yml

@@ -69,14 +69,5 @@ jobs:
         run: go test -race ./...
 
   lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
-        with:
-          version: latest
-          args: --timeout=5m
+    name: Lint
+    uses: nspcc-dev/.github/.github/workflows/go-linter.yml@master

.gitignore

@@ -28,6 +28,7 @@ testfile
 
 # misc
 .neofs-cli.yml
+.golangci.yml
 
 # debhelpers
 **/.debhelper

CHANGELOG.md

@@ -19,6 +19,7 @@ attribute, which is used for container domain name in NNS contracts (#2954)
 - `ObjectService`'s `Put` RPC handler caches up to 10K lists of per-object sorted container nodes (#2901)
 - Metabase graveyard scheme (#2929)
 - When an error is returned, no additional help output is displayed in cobra-based programs (#2942)
+- Use org-wide linter (#2943)
 
 ### Removed
 - Support for node.key configuration (#2959)

Makefile

@@ -128,8 +128,11 @@ test:
 	@echo "⇒ Running go test"
 	@go test ./...
 
+.golangci.yml:
+	wget -O $@ https://github.com/nspcc-dev/.github/raw/master/.golangci.yml
+
 # Run linters
-lint:
+lint: .golangci.yml
 	@golangci-lint --timeout=5m run
 
 # Run linters in Docker

cmd/neofs-adm/internal/modules/morph/container.go

@@ -189,7 +189,7 @@
 	var id cid.ID
 	b := smartcontract.NewBuilder()
 	for _, cnt := range containers {
-		id.FromBinary(cnt.Value)
+		id = cid.NewFromMarshalledContainer(cnt.Value)
 		if _, ok := requested[id]; !ok {
 			continue
 		}

cmd/neofs-adm/internal/modules/morph/estimation.go

@@ -1,7 +1,6 @@
 package morph
 
 import (
-	"crypto/sha256"
 	"fmt"
 
 	"github.com/google/uuid"
@@ -75,10 +74,7 @@
 		return fmt.Errorf("container contract hash resolution: %w", err)
 	}
 
-	cIDBytes := make([]byte, sha256.Size)
-	cID.Encode(cIDBytes)
-
-	sID, iter, err := unwrap.SessionIterator(inv.Call(cnrHash, "iterateContainerSizes", epoch, cIDBytes))
+	sID, iter, err := unwrap.SessionIterator(inv.Call(cnrHash, "iterateContainerSizes", epoch, cID[:]))
 	if err != nil {
 		return fmt.Errorf("iterator expansion: %w", err)
 	}

cmd/neofs-cli/internal/common/token.go

@@ -27,7 +27,7 @@
 
 	err = ReadBinaryOrJSON(cmd, &tok, path)
 	if err != nil {
-		return nil, fmt.Errorf("invalid bearer token: %v", err)
+		return nil, fmt.Errorf("invalid bearer token: %w", err)
 	}
 
 	return &tok, nil

cmd/neofs-cli/modules/accounting/balance.go

@@ -37,7 +37,7 @@
 
 		balanceOwner, _ := cmd.Flags().GetString(ownerFlag)
 		if balanceOwner == "" {
-			idUser = user.ResolveFromECDSAPublicKey(pk.PublicKey)
+			idUser = user.NewFromECDSAPublicKey(pk.PublicKey)
 		} else {
 			return fmt.Errorf("can't decode owner ID wallet address: %w", idUser.DecodeString(balanceOwner))
 		}

cmd/neofs-cli/modules/acl/extended/create.go

@@ -72,13 +72,13 @@
 	var containerID cid.ID
 	if cidArg != "" {
 		if err := containerID.DecodeString(cidArg); err != nil {
-			return fmt.Errorf("invalid container ID: %v\n", err)
+			return fmt.Errorf("invalid container ID: %w\n", err)
 		}
 	}
 
 	rulesFile, err := getRulesFromFile(fileArg)
 	if err != nil {
-		return fmt.Errorf("can't read rules from file: %v\n", err)
+		return fmt.Errorf("can't read rules from file: %w\n", err)
 	}
 
 	rules = append(rules, rulesFile...)

cmd/neofs-cli/modules/acl/extended/create_test.go

@@ -68,21 +68,21 @@ func TestParseTable(t *testing.T) {
 		},
 	}
 
-	eaclTable := eacl.NewTable()
+	var eaclTable eacl.Table
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			err := util.ParseEACLRule(eaclTable, test.rule)
+			err := util.ParseEACLRule(&eaclTable, test.rule)
 			ok := len(test.jsonRecord) > 0
 			require.Equal(t, ok, err == nil, err)
 			if ok {
-				expectedRecord := eacl.NewRecord()
+				var expectedRecord eacl.Record
 				err = expectedRecord.UnmarshalJSON([]byte(test.jsonRecord))
 				require.NoError(t, err)
 
 				actualRecord := eaclTable.Records()[len(eaclTable.Records())-1]
 
-				equalRecords(t, expectedRecord, &actualRecord)
+				equalRecords(t, &expectedRecord, &actualRecord)
 			}
 		})
 	}

cmd/neofs-cli/modules/container/create.go

@@ -108,7 +108,7 @@
 			issuer := tok.Issuer()
 			cnr.SetOwner(issuer)
 		} else {
-			cnr.SetOwner(user.ResolveFromECDSAPublicKey(key.PublicKey))
+			cnr.SetOwner(user.NewFromECDSAPublicKey(key.PublicKey))
 		}
 
 		cnr.SetPlacementPolicy(*placementPolicy)
@@ -157,7 +157,7 @@
 			for ; ; t.Reset(waitInterval) {
 				select {
 				case <-ctx.Done():
-					return fmt.Errorf("container creation: %s", common.ErrAwaitTimeout)
+					return fmt.Errorf("container creation: %w", common.ErrAwaitTimeout)
 				case <-t.C:
 				}
 

cmd/neofs-cli/modules/container/delete.go

@@ -59,15 +59,15 @@
 			if tok != nil {
 				common.PrintVerbose(cmd, "Checking session issuer...")
 
-				if !tok.Issuer().Equals(owner) {
+				if tok.Issuer() != owner {
 					return fmt.Errorf("session issuer differs with the container owner: expected %s, has %s", owner, tok.Issuer())
 				}
 			} else {
 				common.PrintVerbose(cmd, "Checking provided account...")
 
-				acc := user.ResolveFromECDSAPublicKey(pk.PublicKey)
+				acc := user.NewFromECDSAPublicKey(pk.PublicKey)
 
-				if !acc.Equals(owner) {
+				if acc != owner {
 					return fmt.Errorf("provided account differs with the container owner: expected %s, has %s", owner, acc)
 				}
 			}
@@ -132,7 +132,7 @@
 			for ; ; t.Reset(waitInterval) {
 				select {
 				case <-ctx.Done():
-					return fmt.Errorf("container deletion: %s", common.ErrAwaitTimeout)
+					return fmt.Errorf("container deletion: %w", common.ErrAwaitTimeout)
 				case <-t.C:
 				}
 

cmd/neofs-cli/modules/container/get.go

@@ -94,8 +94,7 @@
 		return nil
 	}
 
-	var id cid.ID
-	cnr.CalculateID(&id)
+	id := cid.NewFromMarshalledContainer(cnr.Marshal())
 	cmd.Println("container ID:", id)
 
 	cmd.Println("owner ID:", cnr.Owner())

cmd/neofs-cli/modules/container/list.go

@@ -39,8 +39,8 @@
 		}
 
 		if flagVarListContainerOwner == "" {
-			idUser = user.ResolveFromECDSAPublicKey(key.PublicKey)
+			idUser = user.NewFromECDSAPublicKey(key.PublicKey)
 		} else {
 			err := idUser.DecodeString(flagVarListContainerOwner)
 			if err != nil {
 				return fmt.Errorf("invalid user ID: %w", err)

cmd/neofs-cli/modules/container/nodes.go

@@ -40,8 +40,7 @@ var containerNodesCmd = &cobra.Command{
 			return fmt.Errorf("unable to get netmap snapshot: %w", err)
 		}
 
-		var id cid.ID
-		cnr.CalculateID(&id)
+		id := cid.NewFromMarshalledContainer(cnr.Marshal())
 
 		policy := cnr.PlacementPolicy()
 

cmd/neofs-cli/modules/container/set_eacl.go

@@ -79,15 +79,15 @@
 			if tok != nil {
 				common.PrintVerbose(cmd, "Checking session issuer...")
 
-				if !tok.Issuer().Equals(owner) {
+				if tok.Issuer() != owner {
 					return fmt.Errorf("session issuer differs with the container owner: expected %s, has %s", owner, tok.Issuer())
 				}
 			} else {
 				common.PrintVerbose(cmd, "Checking provided account...")
 
-				acc := user.ResolveFromECDSAPublicKey(pk.PublicKey)
+				acc := user.NewFromECDSAPublicKey(pk.PublicKey)
 
-				if !acc.Equals(owner) {
+				if acc != owner {
 					return fmt.Errorf("provided account differs with the container owner: expected %s, has %s", owner, acc)
 				}
 			}
@@ -136,7 +136,7 @@
 			for ; ; t.Reset(waitInterval) {
 				select {
 				case <-ctx.Done():
-					return fmt.Errorf("eACL setting: %s", common.ErrAwaitTimeout)
+					return fmt.Errorf("eACL setting: %w", common.ErrAwaitTimeout)
 				case <-t.C:
 				}
 

cmd/neofs-cli/modules/container/util.go

@@ -49,7 +49,7 @@
 
 	err := common.ReadBinaryOrJSON(cmd, &res, path)
 	if err != nil {
-		return nil, fmt.Errorf("read container session: %v", err)
+		return nil, fmt.Errorf("read container session: %w", err)
 	}
 
 	common.PrintVerbose(cmd, "Session successfully read.")

cmd/neofs-cli/modules/control/synchronize_tree.go

@@ -1,7 +1,6 @@
 package control
 
 import (
-	"crypto/sha256"
 	"errors"
 	"fmt"
 
@@ -55,12 +54,9 @@
 
 	height, _ := cmd.Flags().GetUint64("height")
 
-	rawCID := make([]byte, sha256.Size)
-	cnr.Encode(rawCID)
-
 	req := &control.SynchronizeTreeRequest{
 		Body: &control.SynchronizeTreeRequest_Body{
-			ContainerId: rawCID,
+			ContainerId: cnr[:],
 			TreeId:      treeID,
 			Height:      height,
 		},

cmd/neofs-cli/modules/object/head.go

@@ -135,11 +135,11 @@
 	}
 }
 
-func printObjectID(cmd *cobra.Command, recv func() (oid.ID, bool)) {
+func printObjectID(cmd *cobra.Command, recv func() oid.ID) {
 	var strID string
 
-	id, ok := recv()
-	if ok {
+	id := recv()
+	if !id.IsZero() {
 		strID = id.String()
 	} else {
 		strID = "<empty>"
@@ -148,11 +148,11 @@
 	cmd.Printf("ID: %s\n", strID)
 }
 
-func printContainerID(cmd *cobra.Command, recv func() (cid.ID, bool)) {
+func printContainerID(cmd *cobra.Command, recv func() cid.ID) {
 	var strID string
 
-	id, ok := recv()
-	if ok {
+	id := recv()
+	if !id.IsZero() {
 		strID = id.String()
 	} else {
 		strID = "<empty>"
@@ -162,8 +162,8 @@
 }
 
 func printHeader(cmd *cobra.Command, obj *object.Object) error {
-	printObjectID(cmd, obj.ID)
-	printContainerID(cmd, obj.ContainerID)
+	printObjectID(cmd, obj.GetID)
+	printContainerID(cmd, obj.GetContainerID)
 	cmd.Printf("Owner: %s\n", obj.OwnerID())
 	cmd.Printf("CreatedAt: %d\n", obj.CreationEpoch())
 	cmd.Printf("Size: %d\n", obj.PayloadSize())
@@ -197,11 +197,11 @@
 		cmd.Printf("Split ID: %s\n", splitID)
 	}
 
-	if oid, ok := obj.ParentID(); ok {
-		cmd.Printf("Split ParentID: %s\n", oid)
+	if oID := obj.GetParentID(); !oID.IsZero() {
+		cmd.Printf("Split ParentID: %s\n", oID)
 	}
 
-	if prev, ok := obj.PreviousID(); ok {
+	if prev := obj.GetPreviousID(); !prev.IsZero() {
 		cmd.Printf("Split PreviousID: %s\n", prev)
 	}