From 493dc8fcd53ceb808e33b415cca06e678e5ecc86 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Sat, 4 Oct 2014 13:20:07 +0100 Subject: [PATCH] Remove unused argument/variable --- cmd/syncthing/main.go | 2 +- internal/model/model.go | 8 +++----- internal/model/model_test.go | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 428aee5e0..f1c748c68 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -442,7 +442,7 @@ func syncthingMain() { } } - m := model.NewModel(confDir, &cfg, myName, "syncthing", Version, db) + m := model.NewModel(&cfg, myName, "syncthing", Version, db) nextFolder: for i, folder := range cfg.Folders { diff --git a/internal/model/model.go b/internal/model/model.go index e1062e745..8d38c6f6b 100644 --- a/internal/model/model.go +++ b/internal/model/model.go @@ -81,9 +81,8 @@ type service interface { } type Model struct { - indexDir string - cfg *config.Configuration - db *leveldb.DB + cfg *config.Configuration + db *leveldb.DB deviceName string clientName string @@ -119,9 +118,8 @@ var ( // NewModel creates and starts a new model. The model starts in read-only mode, // where it sends index information to connected peers and responds to requests // for file data without altering the local folder in any way. -func NewModel(indexDir string, cfg *config.Configuration, deviceName, clientName, clientVersion string, db *leveldb.DB) *Model { +func NewModel(cfg *config.Configuration, deviceName, clientName, clientVersion string, db *leveldb.DB) *Model { m := &Model{ - indexDir: indexDir, cfg: cfg, db: db, deviceName: deviceName, diff --git a/internal/model/model_test.go b/internal/model/model_test.go index bac1ad70f..85852806e 100644 --- a/internal/model/model_test.go +++ b/internal/model/model_test.go @@ -68,7 +68,7 @@ func init() { func TestRequest(t *testing.T) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", &config.Configuration{}, "device", "syncthing", "dev", db) + m := NewModel(&config.Configuration{}, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) m.ScanFolder("default") @@ -105,7 +105,7 @@ func genFiles(n int) []protocol.FileInfo { func BenchmarkIndex10000(b *testing.B) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", nil, "device", "syncthing", "dev", db) + m := NewModel(nil, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) m.ScanFolder("default") files := genFiles(10000) @@ -118,7 +118,7 @@ func BenchmarkIndex10000(b *testing.B) { func BenchmarkIndex00100(b *testing.B) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", nil, "device", "syncthing", "dev", db) + m := NewModel(nil, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) m.ScanFolder("default") files := genFiles(100) @@ -131,7 +131,7 @@ func BenchmarkIndex00100(b *testing.B) { func BenchmarkIndexUpdate10000f10000(b *testing.B) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", nil, "device", "syncthing", "dev", db) + m := NewModel(nil, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) m.ScanFolder("default") files := genFiles(10000) @@ -145,7 +145,7 @@ func BenchmarkIndexUpdate10000f10000(b *testing.B) { func BenchmarkIndexUpdate10000f00100(b *testing.B) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", nil, "device", "syncthing", "dev", db) + m := NewModel(nil, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) m.ScanFolder("default") files := genFiles(10000) @@ -160,7 +160,7 @@ func BenchmarkIndexUpdate10000f00100(b *testing.B) { func BenchmarkIndexUpdate10000f00001(b *testing.B) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", nil, "device", "syncthing", "dev", db) + m := NewModel(nil, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) m.ScanFolder("default") files := genFiles(10000) @@ -218,7 +218,7 @@ func (FakeConnection) Statistics() protocol.Statistics { func BenchmarkRequest(b *testing.B) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", nil, "device", "syncthing", "dev", db) + m := NewModel(nil, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) m.ScanFolder("default") @@ -266,7 +266,7 @@ func TestDeviceRename(t *testing.T) { } db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", &cfg, "device", "syncthing", "dev", db) + m := NewModel(&cfg, "device", "syncthing", "dev", db) if cfg.Devices[0].Name != "" { t.Errorf("Device already has a name") } @@ -324,7 +324,7 @@ func TestClusterConfig(t *testing.T) { db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", &cfg, "device", "syncthing", "dev", db) + m := NewModel(&cfg, "device", "syncthing", "dev", db) m.AddFolder(cfg.Folders[0]) m.AddFolder(cfg.Folders[1]) @@ -390,7 +390,7 @@ func TestIgnores(t *testing.T) { } db, _ := leveldb.Open(storage.NewMemStorage(), nil) - m := NewModel("/tmp", nil, "device", "syncthing", "dev", db) + m := NewModel(nil, "device", "syncthing", "dev", db) m.AddFolder(config.FolderConfiguration{ID: "default", Path: "testdata"}) expected := []string{