Revert "GODT-2229: Allow changing cache folder to a non-empty folder."

This reverts commit b19e16e4b8.

internal/vault/migrate_test.go

@@ -57,7 +57,7 @@ func TestMigrate(t *testing.T) {
 	require.False(t, corrupt)
 
 	// Check the migrated vault.
-	require.Equal(t, "v2.3.x-gluon-dir", s.GetGluonCacheDir())
+	require.Equal(t, "v2.3.x-gluon-dir", s.GetGluonDir())
 	require.Equal(t, 1234, s.GetIMAPPort())
 	require.Equal(t, 5678, s.GetSMTPPort())
 

internal/vault/settings.go

@@ -70,8 +70,8 @@ func (vault *Vault) SetSMTPSSL(ssl bool) error {
 	})
 }
 
-// GetGluonCacheDir sets the directory where the gluon should store its data.
-func (vault *Vault) GetGluonCacheDir() string {
+// GetGluonDir sets the directory where the gluon should store its data.
+func (vault *Vault) GetGluonDir() string {
 	return vault.get().Settings.GluonDir
 }
 

internal/vault/settings_test.go

@@ -67,13 +67,13 @@ func TestVault_Settings_GluonDir(t *testing.T) {
 	require.False(t, corrupt)
 
 	// Check the default gluon dir.
-	require.Equal(t, "/path/to/gluon", s.GetGluonCacheDir())
+	require.Equal(t, "/path/to/gluon", s.GetGluonDir())
 
 	// Modify the gluon dir.
 	require.NoError(t, s.SetGluonDir("/tmp/gluon"))
 
 	// Check the new gluon dir.
-	require.Equal(t, "/tmp/gluon", s.GetGluonCacheDir())
+	require.Equal(t, "/tmp/gluon", s.GetGluonDir())
 }
 
 func TestVault_Settings_UpdateChannel(t *testing.T) {

internal/vault/vault_test.go

@@ -89,7 +89,7 @@ func TestVault_Reset(t *testing.T) {
 	require.Equal(t, 5678, s.GetSMTPPort())
 
 	// Reset.
-	require.NoError(t, s.Reset(s.GetGluonCacheDir()))
+	require.NoError(t, s.Reset(s.GetGluonDir()))
 
 	// The data is gone.
 	require.Equal(t, 1143, s.GetIMAPPort())