From 2f8aa2ce30f9bba828f8c9ef78c2fdc2dbe115ec Mon Sep 17 00:00:00 2001
From: greatroar <@>
Date: Mon, 17 Feb 2020 00:21:37 +0100
Subject: [PATCH] Remove unused fs.FS from archiver.FileSaver
---
internal/archiver/archiver.go | 1 -
internal/archiver/file_saver.go | 4 +---
internal/archiver/file_saver_test.go | 6 +++---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/internal/archiver/archiver.go b/internal/archiver/archiver.go
index 2597e4143..222dd1507 100644
--- a/internal/archiver/archiver.go
+++ b/internal/archiver/archiver.go
@@ -754,7 +754,6 @@ func (arch *Archiver) runWorkers(ctx context.Context, t *tomb.Tomb) {
arch.blobSaver = NewBlobSaver(ctx, t, arch.Repo, arch.Options.SaveBlobConcurrency)
arch.fileSaver = NewFileSaver(ctx, t,
- arch.FS,
arch.blobSaver.Save,
arch.Repo.Config().ChunkerPolynomial,
arch.Options.FileReadConcurrency, arch.Options.SaveBlobConcurrency)
diff --git a/internal/archiver/file_saver.go b/internal/archiver/file_saver.go
index 66defe358..c958e4e19 100644
--- a/internal/archiver/file_saver.go
+++ b/internal/archiver/file_saver.go
@@ -53,7 +53,6 @@ type SaveBlobFn func(context.Context, restic.BlobType, *Buffer) FutureBlob
// FileSaver concurrently saves incoming files to the repo.
type FileSaver struct {
- fs fs.FS
saveFilePool *BufferPool
saveBlob SaveBlobFn
@@ -69,7 +68,7 @@ type FileSaver struct {
// NewFileSaver returns a new file saver. A worker pool with fileWorkers is
// started, it is stopped when ctx is cancelled.
-func NewFileSaver(ctx context.Context, t *tomb.Tomb, fs fs.FS, save SaveBlobFn, pol chunker.Pol, fileWorkers, blobWorkers uint) *FileSaver {
+func NewFileSaver(ctx context.Context, t *tomb.Tomb, save SaveBlobFn, pol chunker.Pol, fileWorkers, blobWorkers uint) *FileSaver {
ch := make(chan saveFileJob)
debug.Log("new file saver with %v file workers and %v blob workers", fileWorkers, blobWorkers)
@@ -77,7 +76,6 @@ func NewFileSaver(ctx context.Context, t *tomb.Tomb, fs fs.FS, save SaveBlobFn,
poolSize := fileWorkers + blobWorkers
s := &FileSaver{
- fs: fs,
saveBlob: save,
saveFilePool: NewBufferPool(ctx, int(poolSize), chunker.MaxSize),
pol: pol,
diff --git a/internal/archiver/file_saver_test.go b/internal/archiver/file_saver_test.go
index c8cf58735..88e62fd57 100644
--- a/internal/archiver/file_saver_test.go
+++ b/internal/archiver/file_saver_test.go
@@ -30,7 +30,7 @@ func createTestFiles(t testing.TB, num int) (files []string, cleanup func()) {
return files, cleanup
}
-func startFileSaver(ctx context.Context, t testing.TB, fs fs.FS) (*FileSaver, *tomb.Tomb) {
+func startFileSaver(ctx context.Context, t testing.TB) (*FileSaver, *tomb.Tomb) {
var tmb tomb.Tomb
saveBlob := func(ctx context.Context, tpe restic.BlobType, buf *Buffer) FutureBlob {
@@ -45,7 +45,7 @@ func startFileSaver(ctx context.Context, t testing.TB, fs fs.FS) (*FileSaver, *t
t.Fatal(err)
}
- s := NewFileSaver(ctx, &tmb, fs, saveBlob, pol, workers, workers)
+ s := NewFileSaver(ctx, &tmb, saveBlob, pol, workers, workers)
s.NodeFromFileInfo = restic.NodeFromFileInfo
return s, &tmb
@@ -62,7 +62,7 @@ func TestFileSaver(t *testing.T) {
completeFn := func(*restic.Node, ItemStats) {}
testFs := fs.Local{}
- s, tmb := startFileSaver(ctx, t, testFs)
+ s, tmb := startFileSaver(ctx, t)
var results []FutureFile