Skip to content

Commit f2a9fa5

Browse files
committed
fix linter
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent e537fe0 commit f2a9fa5

33 files changed

Lines changed: 1878 additions & 83 deletions

File tree

integration/nwo/token/common/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const (
2222
)
2323

2424
func pathExists(path string) bool {
25-
if _, err := os.Stat(path); os.IsNotExist(err) {
25+
if _, err := os.Stat(path); os.IsNotExist(err) { //nolint:gosec
2626
return false
2727
}
2828

integration/nwo/txgen/model/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type UserAlias = string
4242
type UserConfig struct {
4343
Name UserAlias `json:"name" yaml:"name"`
4444
Username Username `json:"username" yaml:"username"`
45-
Password string `json:"password" yaml:"password"`
45+
Password string `json:"password" yaml:"password"` //nolint:gosec
4646
Endpoint string `json:"endpoint" yaml:"endpoint"`
4747
}
4848

integration/nwo/txgen/service/metrics/reporter.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ func (c *reporter) Summary() string {
5959
b := strings.Builder{}
6060

6161
if c.RequestsSent.(gettable).Get() != 0 {
62-
b.WriteString(fmt.Sprintf("Total requests %d, average duration of the request %v\n",
62+
fmt.Fprintf(&b, "Total requests %d, average duration of the request %v\n",
6363
int(c.RequestsSent.(gettable).Get()),
64-
time.Duration(c.RequestDuration.(retrievable).Avg())))
65-
b.WriteString(fmt.Sprintf("Success ratio %.2f%%\n",
66-
c.RequestsReceived.(gettable).Get()/c.RequestsSent.(gettable).Get()*100))
67-
b.WriteString(fmt.Sprintf("Minimum request took %v, maximum %v\n",
64+
time.Duration(c.RequestDuration.(retrievable).Avg()))
65+
fmt.Fprintf(&b, "Success ratio %.2f%%\n",
66+
c.RequestsReceived.(gettable).Get()/c.RequestsSent.(gettable).Get()*100)
67+
fmt.Fprintf(&b, "Minimum request took %v, maximum %v\n",
6868
time.Duration(c.RequestDuration.(retrievable).Min()),
69-
time.Duration(c.RequestDuration.(retrievable).Max())))
69+
time.Duration(c.RequestDuration.(retrievable).Max()))
7070
}
7171

7272
return b.String()

integration/nwo/txgen/service/user/rest/intermediary_api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package rest
88

99
type LoginRequest struct {
1010
Username string `json:"username"`
11-
Password string `json:"password"`
11+
Password string `json:"password"` //nolint:gosec
1212
}
1313

1414
type LoginResponse struct {

integration/nwo/txgen/service/user/rest/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (u *restUser) doRequest(request *http.Request, requestType c.ApiRequestType
173173
With(metrics.OperationLabel, operationType).Add(1)
174174

175175
start := time.Now()
176-
response, err := u.httpClient.Do(request)
176+
response, err := u.httpClient.Do(request) //nolint:gosec
177177

178178
successType := metrics.SuccessValues[err == nil || response != nil && response.StatusCode >= http.StatusBadRequest]
179179
u.metrics.RequestsReceived.

token/core/zkatdlog/nogh/v1/issue/issuer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func prepareZKIssue(t *testing.T, bits uint64, curveID math.CurveID, numOutputs
232232
func prepareInputsForZKIssue(pp *v1.PublicParams, numOutputs int) ([]*token.Metadata, []*math.G1) {
233233
values := make([]uint64, numOutputs)
234234
for i := range numOutputs {
235-
values[i] = uint64(i*10 + 10) //nolint:gosec
235+
values[i] = uint64(i*10 + 10)
236236
}
237237
curve := math.Curves[pp.Curve]
238238
rand, _ := curve.Rand()

token/core/zkatdlog/nogh/v1/transfer/transfer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,12 @@ func prepareInputsForZKTransfer(pp *v1.PublicParams, numInputs int, numOutputs i
235235
// prepare inputs
236236
sumInputs := uint64(0)
237237
for i := range numInputs {
238-
v := uint64(i*10 + 500) //nolint:gosec
238+
v := uint64(i*10 + 500)
239239
sumInputs += v
240240
inValues[i] = v
241241
}
242242

243-
outputValue := sumInputs / uint64(numOutputs)
243+
outputValue := sumInputs / uint64(numOutputs) //nolint:gosec
244244
sumOutputs := uint64(0)
245245
for i := range numOutputs {
246246
outValues[i] = outputValue

token/core/zkatdlog/nogh/v1/transfer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func newTransferEnv(benchmarkCase *benchmark2.Case, configurations *benchmark.Se
169169
for i := range benchmarkCase.NumOutputs {
170170
outputs[i] = &token.Token{
171171
Owner: ownerID,
172-
Quantity: token.NewQuantityFromUInt64(uint64(i*10 + 10)).Hex(), //nolint:gosec
172+
Quantity: token.NewQuantityFromUInt64(uint64(i*10 + 10)).Hex(),
173173
Type: "ABC",
174174
}
175175
}
@@ -179,7 +179,7 @@ func newTransferEnv(benchmarkCase *benchmark2.Case, configurations *benchmark.Se
179179
ids := make([]*token.ID, numInputs)
180180
values := make([]uint64, numInputs)
181181
for i := range numInputs {
182-
values[i] = uint64(i*10 + 10) //nolint:gosec
182+
values[i] = uint64(i*10 + 10)
183183
}
184184
baseTokens, metadata, err := v1token.GetTokensWithWitness(values, "ABC", pp.PedersenGenerators, math.Curves[pp.Curve])
185185
if err != nil {

token/core/zkatdlog/nogh/v1/validator/testing/env.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,12 @@ func prepareTransfer(benchCase *benchmark2.Case, pp *v1.PublicParams, signer dri
449449
inValues := make([]*math.Zr, benchCase.NumInputs)
450450
sumInputs := uint64(0)
451451
for i := range benchCase.NumInputs {
452-
v := uint64(i*10 + 500) //nolint:gosec
452+
v := uint64(i*10 + 500)
453453
sumInputs += v
454454
inValues[i] = c.NewZrFromUint64(v)
455455
}
456456

457-
outputValue := sumInputs / uint64(benchCase.NumOutputs)
457+
outputValue := sumInputs / uint64(benchCase.NumOutputs) //nolint:gosec
458458
sumOutputs := uint64(0)
459459
outValues := make([]uint64, benchCase.NumOutputs)
460460
for i := range benchCase.NumOutputs {

token/sdk/db/checks.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import (
1111
"github.com/hyperledger-labs/fabric-token-sdk/token/services/auditor"
1212
"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/auditdb"
1313
"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/db/common"
14-
"github.com/hyperledger-labs/fabric-token-sdk/token/services/storage/ttxdb"
1514
"github.com/hyperledger-labs/fabric-token-sdk/token/services/tokens"
16-
"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx"
15+
"github.com/hyperledger-labs/fabric-token-sdk/token/services/ttx/dep"
1716
)
1817

1918
type AuditorCheckServiceProvider struct {
@@ -31,7 +30,7 @@ func NewAuditorCheckServiceProvider(tmsProvider common.TokenManagementServicePro
3130
}
3231

3332
func (a *AuditorCheckServiceProvider) CheckService(id token.TMSID, adb *auditdb.StoreService, tdb *tokens.Service) (auditor.CheckService, error) {
34-
return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, adb, tdb, id), a.checkers...)), nil
33+
return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, adb, id), a.checkers...)), nil
3534
}
3635

3736
type OwnerCheckServiceProvider struct {
@@ -48,6 +47,6 @@ func NewOwnerCheckServiceProvider(tmsProvider common.TokenManagementServiceProvi
4847
}
4948
}
5049

51-
func (a *OwnerCheckServiceProvider) CheckService(id token.TMSID, txdb *ttxdb.StoreService, tdb *tokens.Service) (ttx.CheckService, error) {
52-
return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, txdb, tdb, id), a.checkers...)), nil
50+
func (a *OwnerCheckServiceProvider) CheckService(id token.TMSID, adb dep.StoreService, _ dep.TokensService) (dep.CheckService, error) {
51+
return common.NewChecksService(append(common.NewDefaultCheckers(a.tmsProvider, a.networkProvider, adb, id), a.checkers...)), nil
5352
}

0 commit comments

Comments
 (0)