Skip to content

Commit f98ef5b

Browse files
committed
enabled more linters, need to fix the issues
Signed-off-by: Angelo De Caro <[email protected]>
1 parent b20253e commit f98ef5b

File tree

9 files changed

+29
-22
lines changed

9 files changed

+29
-22
lines changed

.golangci.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ linters:
1212
- ginkgolinter
1313
# - gocognit
1414
# - goconst
15-
# - gocritic
15+
- gocritic
1616
# - godot
1717
# - gosec
1818
# - intrange
@@ -25,7 +25,7 @@ linters:
2525
- nilnesserr
2626
- nolintlint
2727
# - paralleltest
28-
# - prealloc
28+
- prealloc
2929
# - promlinter
3030
# - revive
3131
# - rowserrcheck
@@ -38,7 +38,7 @@ linters:
3838
- wastedassign
3939
- whitespace
4040
- govet
41-
# - staticcheck
41+
- staticcheck
4242
- canonicalheader
4343
# - copyloopvar
4444
- dupword
@@ -50,9 +50,16 @@ linters:
5050
- nakedret
5151
- sloglint
5252
- usestdlibvars
53+
- bodyclose
5354
# wrapcheck is not working as expected. It is categorizing internal packages as external.
5455
#- wrapcheck
5556
settings:
57+
gocritic:
58+
settings:
59+
hugeParam:
60+
sizeThreshold: 64 # bytes; tune for your codebase
61+
rangeValCopy:
62+
sizeThreshold: 64
5663
errcheck:
5764
# Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
5865
# Such cases aren't reported by default.
@@ -222,4 +229,6 @@ linters:
222229
# local-prefixes:
223230
# - github.ibm.com/decentralized-trust-research/idap
224231
# exclusions:
225-
# generated: lax
232+
# generated: lax
233+
issues:
234+
exclude-use-default: false

cmd/tokengen/cobra/pp/common/common.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ func GetX509Identity(entry string) (driver.Identity, error) {
5151
}
5252

5353
// SetupIssuersAndAuditors sets up the issuers and auditors for the given public parameters
54-
func SetupIssuersAndAuditors(pp PP, Auditors, Issuers []string) error {
55-
// Auditors
56-
for _, auditor := range Auditors {
54+
func SetupIssuersAndAuditors(pp PP, auditors, issuers []string) error {
55+
// auditors
56+
for _, auditor := range auditors {
5757
id, err := GetX509Identity(auditor)
5858
if err != nil {
5959
return errors.WithMessagef(err, "failed to get auditor identity [%s]", auditor)
6060
}
6161
pp.AddAuditor(id)
6262
}
63-
// Issuers
64-
for _, issuer := range Issuers {
63+
// issuers
64+
for _, issuer := range issuers {
6565
id, err := GetX509Identity(issuer)
6666
if err != nil {
6767
return errors.WithMessagef(err, "failed to get issuer identity [%s]", issuer)

token/core/common/ppm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type PublicParamsManager[T driver.PublicParameters] struct {
2525
}
2626

2727
func NewPublicParamsManager[T driver.PublicParameters](
28-
PublicParamsDeserializer PublicParamsDeserializer[T],
28+
publicParamsDeserializer PublicParamsDeserializer[T],
2929
driverName driver.TokenDriverName,
3030
driverVersion driver.TokenDriverVersion,
3131
ppRaw []byte,
@@ -37,7 +37,7 @@ func NewPublicParamsManager[T driver.PublicParameters](
3737
if len(ppRaw) == 0 {
3838
return nil, errors.Errorf("empty public parameters")
3939
}
40-
pp, err := PublicParamsDeserializer.DeserializePublicParams(ppRaw, driverName, driverVersion)
40+
pp, err := publicParamsDeserializer.DeserializePublicParams(ppRaw, driverName, driverVersion)
4141
if err != nil {
4242
return nil, err
4343
}

token/core/common/validator.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type Context[P driver.PublicParameters, T any, TA driver.TransferAction, IA driv
3939
}
4040

4141
func (c *Context[P, T, TA, IA, DS]) CountMetadataKey(key string) {
42-
c.MetadataCounter[key] = c.MetadataCounter[key] + 1
42+
c.MetadataCounter[key]++
4343
}
4444

4545
type ValidateTransferFunc[P driver.PublicParameters, T any, TA driver.TransferAction, IA driver.IssueAction, DS driver.Deserializer] func(c context.Context, ctx *Context[P, T, TA, IA, DS]) error
@@ -64,7 +64,7 @@ type Validator[P driver.PublicParameters, T any, TA driver.TransferAction, IA dr
6464
}
6565

6666
func NewValidator[P driver.PublicParameters, T any, TA driver.TransferAction, IA driver.IssueAction, DS driver.Deserializer](
67-
Logger logging.Logger,
67+
logger logging.Logger,
6868
publicParams P,
6969
deserializer DS,
7070
actionDeserializer ActionDeserializer[TA, IA],
@@ -73,7 +73,7 @@ func NewValidator[P driver.PublicParameters, T any, TA driver.TransferAction, IA
7373
auditingValidators []ValidateAuditingFunc[P, T, TA, IA, DS],
7474
) *Validator[P, T, TA, IA, DS] {
7575
return &Validator[P, T, TA, IA, DS]{
76-
Logger: Logger,
76+
Logger: logger,
7777
PublicParams: publicParams,
7878
Deserializer: deserializer,
7979
ActionDeserializer: actionDeserializer,

token/core/zkatdlog/nogh/protos-go/utils/proto.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import (
1414
)
1515

1616
func ToProtoG1Slice(input []*mathlib.G1) ([]*math.G1, error) {
17-
return protos.ToProtosSliceFunc(input, func(s *mathlib.G1) (*math.G1, error) {
18-
return ToProtoG1(s)
19-
})
17+
return protos.ToProtosSliceFunc(input, ToProtoG1)
2018
}
2119

2220
func ToProtoG1(s *mathlib.G1) (*math.G1, error) {

token/request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ func (r *Request) Issues() []*Issue {
11941194

11951195
// Transfers returns the list of transfers.
11961196
func (r *Request) Transfers() []*Transfer {
1197-
var transfers []*Transfer
1197+
transfers := make([]*Transfer, 0, len(r.Metadata.Transfers))
11981198
for _, transfer := range r.Metadata.Transfers {
11991199
transfers = append(transfers, &Transfer{
12001200
Senders: transfer.Senders(),

token/services/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (m *Service) Configurations() ([]Configuration, error) {
152152
return nil, err
153153
}
154154

155-
var tms []Configuration
155+
tms := make([]Configuration, 0, len(tmsConfigs))
156156
for key, config := range tmsConfigs {
157157
tms = append(tms, NewConfiguration(m.cp, m.version, key, config.ID()))
158158
}

token/services/network/common/rws/translator/translator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (t *Translator) AddPublicParamsDependency() error {
124124
}
125125

126126
func (t *Translator) QueryTokens(ctx context.Context, ids []*token.ID) ([][]byte, error) {
127-
var res [][]byte
127+
res := make([][]byte, 0, len(ids))
128128
var errs []error
129129
for _, id := range ids {
130130
outputID, err := t.KeyTranslator.CreateOutputKey(id.TxId, id.Index)

token/stream.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (is *InputStream) Count() int {
216216
// Owners returns a list of identities that own the tokens in the stream
217217
func (is *InputStream) Owners() *OwnerStream {
218218
ownerMap := map[string]bool{}
219-
var owners []string
219+
owners := make([]string, 0, len(is.inputs))
220220
for _, input := range is.inputs {
221221
_, ok := ownerMap[input.Owner.UniqueID()]
222222
if ok {
@@ -255,7 +255,7 @@ func (is *InputStream) At(i int) *Input {
255255

256256
// IDs returns the IDs of the inputs.
257257
func (is *InputStream) IDs() []*token.ID {
258-
var res []*token.ID
258+
res := make([]*token.ID, 0, len(is.inputs))
259259
for _, input := range is.inputs {
260260
res = append(res, input.Id)
261261
}

0 commit comments

Comments
 (0)