Skip to content

Commit 20ca868

Browse files
pk910pk910
committed
fix golangci-lint issues
1 parent 751a525 commit 20ca868

File tree

7 files changed

+55
-47
lines changed

7 files changed

+55
-47
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ linters:
6666
- linters:
6767
- revive
6868
text: "var-naming: avoid meaningless package names"
69-
path: "pkg/coordinator/(types|web/types|web/utils|web/api)/"
69+
path: "pkg/(types|web/types|web/api)/"
7070
formatters:
7171
enable:
7272
- gofmt

‎pkg/assertoor/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ type Config struct {
4646
ExternalTests []*types.ExternalTestConfig `yaml:"externalTests" json:"externalTests"`
4747
}
4848

49-
//nolint:revive // ignore
5049
type CoordinatorConfig struct {
5150
// Maximum number of tests executed concurrently
5251
MaxConcurrentTests uint64 `yaml:"maxConcurrentTests" json:"maxConcurrentTests"`
@@ -97,6 +96,7 @@ func NewConfig(path string) (*Config, error) {
9796
return config, nil
9897
}
9998

99+
//nolint:gocyclo // validation logic is inherently complex
100100
func (c *Config) Validate() error {
101101
var errs []error
102102

‎pkg/tasks/generate_transaction/task.go‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -201,25 +201,25 @@ func (t *Task) Execute(ctx context.Context) error {
201201
}
202202
}
203203

204-
err = nil
205204
if len(clients) == 0 {
206-
err = fmt.Errorf("no ready clients available")
207-
} else {
208-
walletMgr := t.ctx.Scheduler.GetServices().WalletManager()
209-
for i := 0; i < len(clients); i++ {
210-
client := clients[i%len(clients)]
211-
212-
t.logger.WithFields(logrus.Fields{
213-
"client": client.GetName(),
214-
}).Infof("sending tx: %v", tx.Hash().Hex())
215-
216-
err := walletMgr.GetTxPool().SendTransaction(ctx, t.wallet, tx, &spamoor.SendTransactionOptions{
217-
Client: walletMgr.GetClient(client),
218-
ClientsStartOffset: i,
219-
})
220-
if err == nil {
221-
break
222-
}
205+
return fmt.Errorf("no ready clients available")
206+
}
207+
208+
walletMgr := t.ctx.Scheduler.GetServices().WalletManager()
209+
210+
for i := 0; i < len(clients); i++ {
211+
client := clients[i%len(clients)]
212+
213+
t.logger.WithFields(logrus.Fields{
214+
"client": client.GetName(),
215+
}).Infof("sending tx: %v", tx.Hash().Hex())
216+
217+
err = walletMgr.GetTxPool().SendTransaction(ctx, t.wallet, tx, &spamoor.SendTransactionOptions{
218+
Client: walletMgr.GetClient(client),
219+
ClientsStartOffset: i,
220+
})
221+
if err == nil {
222+
break
223223
}
224224
}
225225

@@ -234,10 +234,12 @@ func (t *Task) Execute(ctx context.Context) error {
234234
t.ctx.Outputs.SetVar("transactionHash", tx.Hash().Hex())
235235

236236
if t.config.AwaitReceipt {
237-
receipt, err := t.ctx.Scheduler.GetServices().WalletManager().GetTxPool().AwaitTransaction(ctx, t.wallet, tx)
237+
var receipt *ethtypes.Receipt
238+
239+
receipt, err = t.ctx.Scheduler.GetServices().WalletManager().GetTxPool().AwaitTransaction(ctx, t.wallet, tx)
238240
if err != nil {
239241
t.logger.Warnf("failed waiting for tx receipt: %v", err)
240-
return fmt.Errorf("failed waiting for tx receipt: %v", err)
242+
return fmt.Errorf("failed waiting for tx receipt: %w", err)
241243
}
242244

243245
if receipt == nil {
@@ -260,14 +262,15 @@ func (t *Task) Execute(ctx context.Context) error {
260262

261263
t.ctx.Outputs.SetVar("contractAddress", receipt.ContractAddress.Hex())
262264

263-
if receiptData, err := vars.GeneralizeData(receipt); err == nil {
265+
receiptData, generalizeErr := vars.GeneralizeData(receipt)
266+
if generalizeErr == nil {
264267
t.ctx.Outputs.SetVar("receipt", receiptData)
265268

266269
if t.config.TransactionReceiptResultVar != "" {
267270
t.ctx.Vars.SetVar(t.config.TransactionReceiptResultVar, receiptData)
268271
}
269272
} else {
270-
t.logger.Warnf("Failed setting `receipt` output: %v", err)
273+
t.logger.Warnf("Failed setting `receipt` output: %v", generalizeErr)
271274
}
272275

273276
if len(t.config.ExpectEvents) > 0 {
@@ -306,7 +309,8 @@ func (t *Task) Execute(ctx context.Context) error {
306309
for _, authorizationWallet := range t.authorizationWallets {
307310
// resync nonces of authorization wallets (might be increased by more than one, so we need to resync)
308311
client := t.ctx.Scheduler.GetServices().WalletManager().GetReadyClient()
309-
err := authorizationWallet.UpdateWallet(ctx, client, true)
312+
313+
err = authorizationWallet.UpdateWallet(ctx, client, true)
310314
if err != nil {
311315
return fmt.Errorf("cannot update authorization wallet: %w", err)
312316
}
@@ -317,6 +321,7 @@ func (t *Task) Execute(ctx context.Context) error {
317321
return nil
318322
}
319323

324+
//nolint:gocyclo // transaction generation has multiple branches for different tx types
320325
func (t *Task) generateTransaction() (*ethtypes.Transaction, error) {
321326
var toAddr *common.Address
322327

@@ -368,6 +373,7 @@ func (t *Task) generateTransaction() (*ethtypes.Transaction, error) {
368373
} else {
369374
txObj, err = t.wallet.BuildLegacyTx(txData)
370375
}
376+
371377
if err != nil {
372378
return nil, err
373379
}
@@ -377,27 +383,25 @@ func (t *Task) generateTransaction() (*ethtypes.Transaction, error) {
377383
return nil, fmt.Errorf("contract deployment not supported with blob transactions")
378384
}
379385

380-
blobData := t.config.BlobData
381-
if blobData == "" {
382-
blobData = "identifier"
383-
}
384-
385386
blobCount := t.config.BlobSidecars
387+
386388
blobRefs := make([][]string, blobCount)
387-
for i := 0; i < int(blobCount); i++ {
389+
390+
for i := uint64(0); i < blobCount; i++ {
388391
blobLabel := fmt.Sprintf("0x1611AA0000%08dFF%02dFF%04dFEED", t.ctx.Index, i, 0)
389392

390393
if t.config.BlobData != "" {
391394
blobRefs[i] = []string{}
395+
392396
for _, blob := range strings.Split(t.config.BlobData, ",") {
393397
if blob == "label" {
394398
blob = blobLabel
395399
}
400+
396401
blobRefs[i] = append(blobRefs[i], blob)
397402
}
398-
399403
} else {
400-
specialBlob := mrand.Intn(50)
404+
specialBlob := mrand.Intn(50) //nolint:gosec // weak random is fine here
401405
switch specialBlob {
402406
case 0: // special blob commitment - all 0x0
403407
blobRefs[i] = []string{"0x0"}
@@ -432,6 +436,7 @@ func (t *Task) generateTransaction() (*ethtypes.Transaction, error) {
432436
} else {
433437
txObj, err = t.wallet.BuildBlobTx(blobTx)
434438
}
439+
435440
if err != nil {
436441
return nil, err
437442
}
@@ -479,6 +484,7 @@ func (t *Task) generateTransaction() (*ethtypes.Transaction, error) {
479484
} else {
480485
txObj, err = t.wallet.BuildSetCodeTx(setCodeTx)
481486
}
487+
482488
if err != nil {
483489
return nil, err
484490
}
@@ -501,6 +507,7 @@ func (t *Task) generateTransaction() (*ethtypes.Transaction, error) {
501507
} else {
502508
txObj, err = t.wallet.BuildDynamicFeeTx(txData)
503509
}
510+
504511
if err != nil {
505512
return nil, err
506513
}

‎pkg/tasks/get_wallet_details/task.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (t *Task) LoadConfig() error {
102102
return nil
103103
}
104104

105-
func (t *Task) Execute(ctx context.Context) error {
105+
func (t *Task) Execute(_ context.Context) error {
106106
var wal *spamoor.Wallet
107107

108108
if t.config.PrivateKey != "" {
@@ -116,8 +116,10 @@ func (t *Task) Execute(ctx context.Context) error {
116116
return fmt.Errorf("cannot initialize wallet: %w", err)
117117
}
118118
} else {
119-
var err error
120119
address := common.HexToAddress(t.config.Address)
120+
121+
var err error
122+
121123
wal, err = t.ctx.Scheduler.GetServices().WalletManager().GetWalletByAddress(t.ctx.Scheduler.GetTestRunCtx(), address)
122124
if err != nil {
123125
return fmt.Errorf("cannot initialize wallet: %w", err)

‎pkg/tasks/run_tasks/task.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ func (t *Task) Execute(ctx context.Context) error {
104104

105105
for i, task := range t.tasks {
106106
err := t.ctx.Scheduler.ExecuteTask(ctx, task, nil)
107-
108107
if err != nil {
109108
if t.config.ContinueOnFailure {
110109
t.logger.Warnf("child task #%v failed: %v", i+1, err)

‎pkg/txmgr/spamoor.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,11 @@ func (s *Spamoor) forwardBlocks(ctx context.Context, blockSubscription *executio
104104
return
105105
case block := <-blockSubscription.Channel():
106106
time.Sleep(1 * time.Second) // wait for block to be seen by all clients
107+
107108
seenBy := block.GetSeenBy()
109+
108110
spamoorClients := make([]*spamoor.Client, 0, len(seenBy))
111+
109112
for _, client := range seenBy {
110113
spamoorClient := s.GetClient(client)
111114
if spamoorClient == nil {

‎pkg/web/api/post_tests_register_api.go‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,23 @@ func (ah *APIHandler) PostTestsRegister(w http.ResponseWriter, r *http.Request)
6363
if r.Header.Get("Content-Type") == contentTypeYAML {
6464
decoder := yaml.NewDecoder(bytes.NewReader(rawBody))
6565

66-
err := decoder.Decode(req)
67-
if err != nil {
68-
ah.sendErrorResponse(w, r.URL.String(), fmt.Sprintf("error decoding request body yaml: %v", err), http.StatusBadRequest)
66+
if decodeErr := decoder.Decode(req); decodeErr != nil {
67+
ah.sendErrorResponse(w, r.URL.String(), fmt.Sprintf("error decoding request body yaml: %v", decodeErr), http.StatusBadRequest)
6968
return
7069
}
7170

7271
yamlSource = string(rawBody)
7372
} else {
7473
decoder := json.NewDecoder(bytes.NewReader(rawBody))
7574

76-
err := decoder.Decode(req)
77-
if err != nil {
78-
ah.sendErrorResponse(w, r.URL.String(), fmt.Sprintf("error decoding request body json: %v", err), http.StatusBadRequest)
75+
if decodeErr := decoder.Decode(req); decodeErr != nil {
76+
ah.sendErrorResponse(w, r.URL.String(), fmt.Sprintf("error decoding request body json: %v", decodeErr), http.StatusBadRequest)
7977
return
8078
}
8179

8280
// Convert JSON to YAML for storage
83-
yamlBytes, err := yaml.Marshal(req)
84-
if err == nil {
81+
yamlBytes, marshalErr := yaml.Marshal(req)
82+
if marshalErr == nil {
8583
yamlSource = string(yamlBytes)
8684
}
8785
}
@@ -113,9 +111,8 @@ func (ah *APIHandler) PostTestsRegister(w http.ResponseWriter, r *http.Request)
113111
}
114112

115113
if req.Timeout != "" {
116-
err := testConfig.Timeout.Unmarshal(req.Timeout)
117-
if err != nil {
118-
ah.sendErrorResponse(w, r.URL.String(), fmt.Sprintf("failed decoding timeout: %v", err), http.StatusBadRequest)
114+
if unmarshalErr := testConfig.Timeout.Unmarshal(req.Timeout); unmarshalErr != nil {
115+
ah.sendErrorResponse(w, r.URL.String(), fmt.Sprintf("failed decoding timeout: %v", unmarshalErr), http.StatusBadRequest)
119116
return
120117
}
121118
}

0 commit comments

Comments
 (0)