From 0df4f41269d53a545f2de3bc8bc32593653b44db Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Tue, 22 Nov 2022 13:59:06 +0100 Subject: [PATCH] Other: Remove unused SyncBuffers setting --- internal/app/migration.go | 4 ---- internal/app/migration_test.go | 1 - internal/bridge/user.go | 1 - internal/user/sync.go | 3 +-- internal/user/user.go | 4 +--- internal/user/user_test.go | 2 +- internal/vault/settings.go | 12 ------------ internal/vault/settings_test.go | 1 - internal/vault/types_settings.go | 2 -- 9 files changed, 3 insertions(+), 27 deletions(-) diff --git a/internal/app/migration.go b/internal/app/migration.go index 0d8415fa..c458768f 100644 --- a/internal/app/migration.go +++ b/internal/app/migration.go @@ -228,10 +228,6 @@ func migratePrefsToVault(vault *vault.Vault, b []byte) error { errs = multierror.Append(errs, fmt.Errorf("failed to migrate sync workers: %w", err)) } - if err := vault.SetSyncBuffer(prefs.FetchWorkers); err != nil { - errs = multierror.Append(errs, fmt.Errorf("failed to migrate sync buffer: %w", err)) - } - if err := vault.SetSyncAttPool(prefs.AttachmentWorkers); err != nil { errs = multierror.Append(errs, fmt.Errorf("failed to migrate sync attachment pool: %w", err)) } diff --git a/internal/app/migration_test.go b/internal/app/migration_test.go index dcac4cf9..5d8b9416 100644 --- a/internal/app/migration_test.go +++ b/internal/app/migration_test.go @@ -62,7 +62,6 @@ func TestMigratePrefsToVault(t *testing.T) { // Check that the other app settings have been migrated. require.Equal(t, 16, vault.SyncWorkers()) - require.Equal(t, 16, vault.SyncBuffer()) require.Equal(t, 16, vault.SyncAttPool()) require.False(t, vault.GetProxyAllowed()) require.False(t, vault.GetShowAllMail()) diff --git a/internal/bridge/user.go b/internal/bridge/user.go index 7253abe3..55f6f520 100644 --- a/internal/bridge/user.go +++ b/internal/bridge/user.go @@ -442,7 +442,6 @@ func (bridge *Bridge) addUserWithVault( bridge.crashHandler, bridge.reporter, bridge.vault.SyncWorkers(), - bridge.vault.SyncBuffer(), bridge.vault.GetShowAllMail(), ) if err != nil { diff --git a/internal/user/sync.go b/internal/user/sync.go index cac90f7c..7890f1d2 100644 --- a/internal/user/sync.go +++ b/internal/user/sync.go @@ -117,7 +117,6 @@ func (user *User) sync(ctx context.Context) error { user.updateCh, user.eventCh, user.syncWorkers, - user.syncBuffer, ); err != nil { return fmt.Errorf("failed to sync messages: %w", err) } @@ -187,7 +186,7 @@ func syncMessages( //nolint:funlen addrKRs map[string]*crypto.KeyRing, updateCh map[string]*queue.QueuedChannel[imap.Update], eventCh *queue.QueuedChannel[events.Event], - syncWorkers, _ int, + syncWorkers int, ) error { ctx, cancel := context.WithCancel(ctx) defer cancel() diff --git a/internal/user/user.go b/internal/user/user.go index e0d1a7d0..1540f66f 100644 --- a/internal/user/user.go +++ b/internal/user/user.go @@ -78,7 +78,6 @@ type User struct { goPollAPIEvents func(wait bool) syncWorkers int - syncBuffer int showAllMail uint32 } @@ -92,7 +91,7 @@ func New( apiUser liteapi.User, crashHandler async.PanicHandler, reporter gluonReporter.Reporter, - syncWorkers, syncBuffer int, + syncWorkers int, showAllMail bool, ) (*User, error) { //nolint:funlen logrus.WithField("userID", apiUser.ID).Info("Creating new user") @@ -136,7 +135,6 @@ func New( pollAPIEventsCh: make(chan chan struct{}), syncWorkers: syncWorkers, - syncBuffer: syncBuffer, showAllMail: b32(showAllMail), } diff --git a/internal/user/user_test.go b/internal/user/user_test.go index 6337d19d..7c794f48 100644 --- a/internal/user/user_test.go +++ b/internal/user/user_test.go @@ -218,7 +218,7 @@ func withUser(tb testing.TB, ctx context.Context, _ *server.Server, m *liteapi.M vaultUser, err := vault.AddUser(apiUser.ID, username, apiAuth.UID, apiAuth.RefreshToken, saltedKeyPass) require.NoError(tb, err) - user, err := New(ctx, vaultUser, client, apiUser, nil, nil, vault.SyncWorkers(), vault.SyncBuffer(), true) + user, err := New(ctx, vaultUser, client, apiUser, nil, nil, vault.SyncWorkers(), true) require.NoError(tb, err) defer user.Close() diff --git a/internal/vault/settings.go b/internal/vault/settings.go index 0d8cf5da..33042b37 100644 --- a/internal/vault/settings.go +++ b/internal/vault/settings.go @@ -214,18 +214,6 @@ func (vault *Vault) SetSyncWorkers(workers int) error { }) } -// SyncBuffer returns the number of buffer workers to use for syncing. -func (vault *Vault) SyncBuffer() int { - return vault.get().Settings.SyncBuffer -} - -// SetSyncBuffer sets the number of buffer workers to use for syncing. -func (vault *Vault) SetSyncBuffer(buffer int) error { - return vault.mod(func(data *Data) { - data.Settings.SyncBuffer = buffer - }) -} - // SyncAttPool returns the size of the attachment pool. func (vault *Vault) SyncAttPool() int { return vault.get().Settings.SyncAttPool diff --git a/internal/vault/settings_test.go b/internal/vault/settings_test.go index 56967595..972c5e9a 100644 --- a/internal/vault/settings_test.go +++ b/internal/vault/settings_test.go @@ -223,6 +223,5 @@ func TestVault_Settings_SyncWorkers(t *testing.T) { s := newVault(t) require.Equal(t, runtime.NumCPU(), s.SyncWorkers()) - require.Equal(t, runtime.NumCPU(), s.SyncBuffer()) require.Equal(t, runtime.NumCPU(), s.SyncAttPool()) } diff --git a/internal/vault/types_settings.go b/internal/vault/types_settings.go index a6d1974f..69be3869 100644 --- a/internal/vault/types_settings.go +++ b/internal/vault/types_settings.go @@ -46,7 +46,6 @@ type Settings struct { FirstStartGUI bool SyncWorkers int - SyncBuffer int SyncAttPool int } @@ -73,7 +72,6 @@ func newDefaultSettings(gluonDir string) Settings { FirstStartGUI: true, SyncWorkers: runtime.NumCPU(), - SyncBuffer: runtime.NumCPU(), SyncAttPool: runtime.NumCPU(), } }