diff options
author | Florian Klink <flokli@flokli.de> | 2023-10-03T09·57+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-10-05T06·11+0000 |
commit | b1ff1267be5f1dfa4f764648da68bbaec8366ecd (patch) | |
tree | 533d5a6af668d83db37148e18e4c311ddf49a933 /tvix/nar-bridge/pkg/reader/hashers.go | |
parent | 6e9a5dcd5937496e4fb5ef6ebcc2b9875be4c68b (diff) |
refactor(tvix/nar-bridge): drop reader package r/6693
Make the import function usable on any reader. Change-Id: I84d2004cb73cdd7a11fe8efb0f2efb6335d5e6b0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9527 Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/nar-bridge/pkg/reader/hashers.go')
-rw-r--r-- | tvix/nar-bridge/pkg/reader/hashers.go | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/tvix/nar-bridge/pkg/reader/hashers.go b/tvix/nar-bridge/pkg/reader/hashers.go deleted file mode 100644 index 7e98d2062d21..000000000000 --- a/tvix/nar-bridge/pkg/reader/hashers.go +++ /dev/null @@ -1,66 +0,0 @@ -package reader - -import ( - "errors" - "fmt" - "hash" - "io" -) - -var _ io.Reader = &Hasher{} - -// Hasher wraps io.Reader. -// You can ask it for the digest of the hash function used internally, and the -// number of bytes written. -type Hasher struct { - r io.Reader - h hash.Hash - bytesRead uint32 -} - -func NewHasher(r io.Reader, h hash.Hash) *Hasher { - return &Hasher{ - r: r, - h: h, - bytesRead: 0, - } -} - -func (h *Hasher) Read(p []byte) (int, error) { - nRead, rdErr := h.r.Read(p) - - // write the number of bytes read from the reader to the hash. - // We need to do this independently on whether there's been error. - // n always describes the number of successfully written bytes. - nHash, hashErr := h.h.Write(p[0:nRead]) - if hashErr != nil { - return nRead, fmt.Errorf("unable to write to hash: %w", hashErr) - } - - // We assume here the hash function accepts the whole p in one Go, - // and doesn't early-return on the Write. - // We compare it with nRead and bail out if that was not the case. - if nHash != nRead { - return nRead, fmt.Errorf("hash didn't accept the full write") - } - - // update bytesWritten - h.bytesRead += uint32(nRead) - - if rdErr != nil { - if errors.Is(rdErr, io.EOF) { - return nRead, rdErr - } - return nRead, fmt.Errorf("error from underlying reader: %w", rdErr) - } - - return nRead, hashErr -} - -func (h *Hasher) BytesWritten() uint32 { - return h.bytesRead -} - -func (h *Hasher) Sum(b []byte) []byte { - return h.h.Sum(b) -} |