From 2b4b6a8470e686b7f6772d7d9085e4742d2e43ac Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 21 Dec 2025 23:46:06 -0500 Subject: [PATCH] refactor: constants, move kTlsFingerprintTrustedServersFilename => Settings::defaultValue where used --- src/lib/common/Constants.h.in | 1 - src/lib/common/Settings.cpp | 2 +- src/unittests/common/SettingsTests.h | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/common/Constants.h.in b/src/lib/common/Constants.h.in index dfc89b979..4b4e6356c 100644 --- a/src/lib/common/Constants.h.in +++ b/src/lib/common/Constants.h.in @@ -22,7 +22,6 @@ const auto kCopyright = // const auto kCoreBinName = "@CORE_BINARY@"; -const auto kTlsFingerprintTrustedServersFilename = "trusted-servers"; const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients"; #ifdef _WIN32 diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index 2766cc6b9..dc78d8740 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -252,7 +252,7 @@ QString Settings::tlsDir() QString Settings::tlsTrustedServersDb() { - return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedServersFilename); + return QStringLiteral("%1/trusted-servers").arg(instance()->tlsDir()); } QString Settings::tlsTrustedClientsDb() diff --git a/src/unittests/common/SettingsTests.h b/src/unittests/common/SettingsTests.h index 22afb95fe..be8434fc3 100644 --- a/src/unittests/common/SettingsTests.h +++ b/src/unittests/common/SettingsTests.h @@ -41,8 +41,7 @@ private: #endif inline static const QString m_expectedTlsDir = QStringLiteral("%1/tls").arg(m_settingsPath); - inline static const QString m_expectedTlsServerDB = - QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintTrustedServersFilename); + inline static const QString m_expectedTlsServerDB = QStringLiteral("%1/trusted-servers").arg(m_expectedTlsDir); inline static const QString m_expectedTlsClientDB = QStringLiteral("%1/%2").arg(m_expectedTlsDir, kTlsFingerprintTrustedClientsFilename); };