Skip to content

Commit

Permalink
Merge pull request #5881 from filecoin-project/fix/lint-skip
Browse files Browse the repository at this point in the history
lint: don't skip builtin
  • Loading branch information
magik6k authored Mar 27, 2021
2 parents 885ecb9 + f5029a0 commit 089ff08
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ linters:
- deadcode
- scopelint

# We don't want to skip builtin/
skip-dirs-use-default: false
skip-dirs:
- vendor$
- testdata$
- examples$

issues:
exclude:
Expand Down
2 changes: 1 addition & 1 deletion chain/actors/builtin/builtin.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type PoStProof = proof0.PoStProof
type FilterEstimate = smoothing0.FilterEstimate

func FromV0FilterEstimate(v0 smoothing0.FilterEstimate) FilterEstimate {
return (FilterEstimate)(v0)
return (FilterEstimate)(v0) //nolint:unconvert
}

// Doesn't change between actors v0, v2, and v3.
Expand Down
2 changes: 1 addition & 1 deletion chain/actors/builtin/multisig/state0.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (s *state0) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
if n <= 0 {
return xerrors.Errorf("invalid pending transaction key: %v", key)
}
return cb(txid, (Transaction)(out))
return cb(txid, (Transaction)(out)) //nolint:unconvert
})
}

Expand Down
2 changes: 1 addition & 1 deletion chain/actors/builtin/multisig/state2.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (s *state2) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
if n <= 0 {
return xerrors.Errorf("invalid pending transaction key: %v", key)
}
return cb(txid, (Transaction)(out))
return cb(txid, (Transaction)(out)) //nolint:unconvert
})
}

Expand Down
2 changes: 1 addition & 1 deletion chain/actors/builtin/multisig/state3.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (s *state3) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
if n <= 0 {
return xerrors.Errorf("invalid pending transaction key: %v", key)
}
return cb(txid, (Transaction)(out))
return cb(txid, (Transaction)(out)) //nolint:unconvert
})
}

Expand Down

0 comments on commit 089ff08

Please sign in to comment.