Cleanup duplicated code

mssun · Feb 8, 2025 · adb0124 · adb0124
1 parent b0a9715
commit adb0124
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
@@ -113,14 +113,6 @@ public class PasswordStore {
         fileManager.fileExists(atPath: Globals.repositoryURL.path)
     }
 
-    public func passwordExisted(password: Password) -> Bool {
-        PasswordEntity.exists(password: password, in: context)
-    }
-
-    public func getPasswordEntity(by path: String, isDir: Bool) -> PasswordEntity? {
-        PasswordEntity.fetch(by: path, isDir: isDir, in: context)
-    }
-
     public func cloneRepository(
         remoteRepoURL: URL,
         branchName: String,
@@ -236,7 +228,7 @@ public class PasswordStore {
     }
 
     private func addPasswordEntities(password: Password) throws -> PasswordEntity? {
-        guard !passwordExisted(password: password) else {
+        guard !PasswordEntity.exists(password: password, in: context) else {
             throw AppError.passwordDuplicated
         }
 

diff --git a/passKitTests/Models/PasswordStoreTest.swift b/passKitTests/Models/PasswordStoreTest.swift
@@ -53,7 +53,7 @@ final class PasswordStoreTest: XCTestCase {
     }
 
     private func decrypt(passwordStore: PasswordStore, path: String, passphrase _: String) throws -> Password {
-        let entity = passwordStore.getPasswordEntity(by: path, isDir: false)!
+        let entity = passwordStore.fetchPasswordEntity(with: path)!
         return try passwordStore.decrypt(passwordEntity: entity, requestPGPKeyPassphrase: requestPGPKeyPassphrase)
     }
 }