Skip to content

Commit

Permalink
Refactor to use DevZero() from plumbing
Browse files Browse the repository at this point in the history
  • Loading branch information
bodgit committed Nov 18, 2022
1 parent 52fde0b commit 08361d5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 54 deletions.
19 changes: 0 additions & 19 deletions internal/zero/reader.go

This file was deleted.

28 changes: 0 additions & 28 deletions internal/zero/reader_test.go

This file was deleted.

10 changes: 5 additions & 5 deletions part.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"io"
"runtime"

"github.com/bodgit/plumbing"
"github.com/bodgit/rvz/internal/util"
"github.com/bodgit/rvz/internal/zero"
"golang.org/x/sync/errgroup"
)

Expand Down Expand Up @@ -81,7 +81,7 @@ func (pr *partReader) readGroup(i int) error {
var (
rc io.ReadCloser
err error
zr = zero.NewReader()
zr = plumbing.DevZero()
r io.Reader
)

Expand Down Expand Up @@ -110,7 +110,7 @@ func (pr *partReader) readGroup(i int) error {
_, _ = pr.h0[j].Write(h.Sum(nil))
}

_, _ = io.CopyN(pr.h0[j], zero.NewReader(), h0Padding)
_, _ = io.CopyN(pr.h0[j], plumbing.DevZero(), h0Padding)
}

return nil
Expand All @@ -129,7 +129,7 @@ func (pr *partReader) writeHashes() {
_, _ = pr.h1[i].Write(h.Sum(nil))
}

_, _ = io.CopyN(pr.h1[i], zero.NewReader(), h1Padding)
_, _ = io.CopyN(pr.h1[i], plumbing.DevZero(), h1Padding)
}

// Calculate the H2 hashes
Expand All @@ -141,7 +141,7 @@ func (pr *partReader) writeHashes() {
_, _ = pr.h2.Write(h.Sum(nil))
}

_, _ = io.CopyN(pr.h2, zero.NewReader(), h2Padding)
_, _ = io.CopyN(pr.h2, plumbing.DevZero(), h2Padding)
}

//nolint:gochecknoglobals
Expand Down
3 changes: 1 addition & 2 deletions reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/bodgit/plumbing"
"github.com/bodgit/rvz/internal/packed"
"github.com/bodgit/rvz/internal/util"
"github.com/bodgit/rvz/internal/zero"
)

const (
Expand Down Expand Up @@ -172,7 +171,7 @@ func (r *reader) groupReader(g int, offset int64, partition bool) (rc io.ReadClo
return nil, nil, err
}
case group.size() == 0:
rc = io.NopCloser(io.LimitReader(zero.NewReader(), r.disc.chunkSize(partition)))
rc = io.NopCloser(io.LimitReader(plumbing.DevZero(), r.disc.chunkSize(partition)))
default:
rc = io.NopCloser(io.NewSectionReader(r.ra, group.offset(), group.size()))
}
Expand Down

0 comments on commit 08361d5

Please sign in to comment.