Merge pull request #46 from bodgit/zero

Refactor to use DevZero() from plumbing

Author: bodgit

internal/zero/reader.go

@@ -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"
 )
 
@@ -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
 	)
 
@@ -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
@@ -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
@@ -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

internal/zero/reader_test.go

@@ -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 (
@@ -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()))
 	}