cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

ci: fix linting

Browse Source
This commit is contained in:
Steven Allen 2022-04-20 11:34:01 +02:00 committed by Geoff Stuart
parent bd9e8c7663
commit 5b1800556b
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.golangci.yml
View File

@ -25,7 +25,7 @@ skip-dirs:
issues: issues:
exclude: exclude:
- "func name will be used as test\\.Test.* by other packages, and that stutters; consider calling this" - "by other packages, and that stutters; consider calling this"
- "Potential file inclusion via variable" - "Potential file inclusion via variable"
- "should have( a package)? comment" - "should have( a package)? comment"
- "Error return value of `logging.SetLogLevel` is not checked" - "Error return value of `logging.SetLogLevel` is not checked"

33
extern/sector-storage/ffiwrapper/sealer_test.go vendored
View File

@ -71,18 +71,21 @@ func (s *seal) precommit(t *testing.T, sb *Sealer, id storage.SectorRef, done fu
r := data(id.ID.Number, dlen) r := data(id.ID.Number, dlen)
s.pi, err = sb.AddPiece(context.TODO(), id, []abi.UnpaddedPieceSize{}, dlen, r) s.pi, err = sb.AddPiece(context.TODO(), id, []abi.UnpaddedPieceSize{}, dlen, r)
if err != nil { if err != nil {
t.Fatalf("%+v", err) t.Errorf("%+v", err)
return
} }
s.ticket = sealRand s.ticket = sealRand
p1, err := sb.SealPreCommit1(context.TODO(), id, s.ticket, []abi.PieceInfo{s.pi}) p1, err := sb.SealPreCommit1(context.TODO(), id, s.ticket, []abi.PieceInfo{s.pi})
if err != nil { if err != nil {
t.Fatalf("%+v", err) t.Errorf("%+v", err)
return
} }
cids, err := sb.SealPreCommit2(context.TODO(), id, p1) cids, err := sb.SealPreCommit2(context.TODO(), id, p1)
if err != nil { if err != nil {
t.Fatalf("%+v", err) t.Errorf("%+v", err)
return
} }
s.cids = cids s.cids = cids
} }
@ -94,11 +97,13 @@ func (s *seal) commit(t *testing.T, sb *Sealer, done func()) storage.Proof {
pc1, err := sb.SealCommit1(context.TODO(), s.ref, s.ticket, seed, []abi.PieceInfo{s.pi}, s.cids) pc1, err := sb.SealCommit1(context.TODO(), s.ref, s.ticket, seed, []abi.PieceInfo{s.pi}, s.cids)
if err != nil { if err != nil {
t.Fatalf("%+v", err) t.Errorf("%+v", err)
return nil
} }
proof, err := sb.SealCommit2(context.TODO(), s.ref, pc1) proof, err := sb.SealCommit2(context.TODO(), s.ref, pc1)
if err != nil { if err != nil {
t.Fatalf("%+v", err) t.Errorf("%+v", err)
return nil
} }
ok, err := ProofVerifier.VerifySeal(proof2.SealVerifyInfo{ ok, err := ProofVerifier.VerifySeal(proof2.SealVerifyInfo{
@ -111,11 +116,13 @@ func (s *seal) commit(t *testing.T, sb *Sealer, done func()) storage.Proof {
UnsealedCID: s.cids.Unsealed, UnsealedCID: s.cids.Unsealed,
}) })
if err != nil { if err != nil {
t.Fatalf("%+v", err) t.Errorf("%+v", err)
return nil
} }
if !ok { if !ok {
t.Fatal("proof failed to validate") t.Errorf("proof failed to validate")
return nil
} }
return proof return proof
@ -458,17 +465,17 @@ func TestSealAndVerify3(t *testing.T) {
s3 := seal{ref: si3} s3 := seal{ref: si3}
wg.Add(3) wg.Add(3)
go s1.precommit(t, sb, si1, wg.Done) //nolint: staticcheck go s1.precommit(t, sb, si1, wg.Done)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
go s2.precommit(t, sb, si2, wg.Done) //nolint: staticcheck go s2.precommit(t, sb, si2, wg.Done)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
go s3.precommit(t, sb, si3, wg.Done) //nolint: staticcheck go s3.precommit(t, sb, si3, wg.Done)
wg.Wait() wg.Wait()
wg.Add(3) wg.Add(3)
go s1.commit(t, sb, wg.Done) //nolint: staticcheck go s1.commit(t, sb, wg.Done)
go s2.commit(t, sb, wg.Done) //nolint: staticcheck go s2.commit(t, sb, wg.Done)
go s3.commit(t, sb, wg.Done) //nolint: staticcheck go s3.commit(t, sb, wg.Done)
wg.Wait() wg.Wait()
post(t, sb, nil, s1, s2, s3) post(t, sb, nil, s1, s2, s3)

2
extern/sector-storage/tarutil/systar.go vendored
View File

@ -31,8 +31,10 @@ func ExtractTar(body io.Reader, dir string, buf []byte) error {
case nil: case nil:
} }
//nolint:gosec
f, err := os.Create(filepath.Join(dir, header.Name)) f, err := os.Create(filepath.Join(dir, header.Name))
if err != nil { if err != nil {
//nolint:gosec
return xerrors.Errorf("creating file %s: %w", filepath.Join(dir, header.Name), err) return xerrors.Errorf("creating file %s: %w", filepath.Join(dir, header.Name), err)
} }