FactorInstanceProvider ("FIP") with Serializable FactorInstancesCache + consumers of "FIP"

.tarpaulin.toml

@@ -1,5 +1,10 @@
 [all]
 exclude-files = [
+    # Skip Uniffi crate, we rely on `crates/sargon` AND hosts being tested
+    "crates/sargon-uniffi/*",
+    # Skip Uniffi crate, we rely on hosts being tested
+    "crates/sargon-uniffi-conversion-macros/*",
+
     "crates/sargon/src/lib.rs",
     # Too many false negatives (macro usage)
     "crates/sargon/src/profile/v100/address/non_fungible_resource_address.rs",

apple/Sources/Sargon/Drivers/FileSystem/FileSystemDriver+Data+ContentsOf+URL.swift

@@ -44,27 +44,60 @@
 		_ io: @Sendable (URL) throws -> T
 	) throws -> T {
 		let url = URL(file: path)
-		guard url.startAccessingSecurityScopedResource() else {
-			throw CommonError.NotPermissionToAccessFile(path: path)
-		}
-		defer { url.stopAccessingSecurityScopedResource() }
+         #if os(macOS)
+		 guard url.startAccessingSecurityScopedResource() else {
+		 	throw CommonError.NotPermissionToAccessFile(path: path)
+		 }
+		 defer { url.stopAccessingSecurityScopedResource() }
+         #endif
 		return try io(url)
 	}
 }
 
 extension FileSystem: FileSystemDriver {
-
+    public func writableAppDirPath() async throws -> String {
+#if os(iOS)
+        try fileManager.url(
+            for: .cachesDirectory,
+            in: .userDomainMask,
+            appropriateFor: nil,
+            create: true
+        ).absoluteString
+#elseif os(macOS)
+        URL.temporaryDirectory.path()
+#else
+        fatalError("Unsupported OS")
+#endif
+    }
+
 	public func loadFromFile(path: String) async throws -> BagOfBytes? {
-		try with(path: path) {
-			try Data(contentsOf: $0)
+        return try with(path: path) {
+            let fileExists = fileManager.fileExists(atPath: $0.path())
+            do {
+                return try Data(contentsOf: $0)
+            } catch {
+                if fileExists {
+                    throw error
+                } else {
+                    return nil
+                }
+            }
 		}
 	}
 
-	public func saveToFile(path: String, data: BagOfBytes) async throws {
-		try with(path: path) {
-			try data.write(to: $0)
-		}
-	}
+    public func saveToFile(path: String, data: BagOfBytes, isAllowedToOverwrite: Bool) async throws {
+
+        try with(path: path) {
+            if fileManager.fileExists(atPath: $0.path()) {
+                if !isAllowedToOverwrite {
+                    throw CommonError.FileAlreadyExists(path: path)
+                }
+            } else {
+                fileManager.createFile(atPath: $0.path(), contents: nil)
+            }
+            try data.write(to: $0)
+        }
+    }
 
 	public func deleteFile(path: String) async throws {
 		try with(path: path) {

apple/Tests/IntegrationTests/DriversTests/EventBusDriverTests.swift

@@ -20,7 +20,7 @@ class EventBusDriverTests: DriverTest<EventBus> {
 
 		let bios = BIOS(drivers: .withEventBus(sut))
 		let os = await TestOS(bios: bios)
-		try await os.os.newWallet()
+		try await os.os.newWallet(shouldPrederiveInstances: false)
 
 		try await os.createAccount()
 		let notifications = await task.value

apple/Tests/IntegrationTests/DriversTests/FileSystemDriverTests.swift

@@ -12,12 +12,27 @@ class FileSystemDriverTests: DriverTest<FileSystem> {
 		let data = Data("This file is completely safe to delete. It was generated by a unit test.".utf8)
 
 		let sut = SUT()
-		try await sut.saveToFile(path: path, data: data)
+        try await sut.saveToFile(path: path, data: data, isAllowedToOverwrite: true)
 		let loaded = try await sut.loadFromFile(path: path)
 		XCTAssertEqual(loaded, data)
 
 		XCTAssertTrue(FileManager.default.fileExists(atPath: path))
 		try await sut.deleteFile(path: path)
 		XCTAssertFalse(FileManager.default.fileExists(atPath: path))
 	}
+
+    func test_without_overwrite() async throws {
+        let nameOfFile = "delete_me_\(UUID().uuidString).txt"
+        let path = URL.temporaryDirectory.appending(path: nameOfFile, directoryHint: .notDirectory).path()
+        let data = Data("This file is completely safe to delete. It was generated by a unit test.".utf8)
+
+        let sut = SUT()
+        try await sut.saveToFile(path: path, data: data, isAllowedToOverwrite: true)
+        do {
+            try await sut.saveToFile(path: path, data: data, isAllowedToOverwrite: false)
+            XCTFail("Expected throw")
+        } catch {
+            // Good, expected to throw
+        }
+    }
 }

apple/Tests/IntegrationTests/SargonOS/TestOSTests.swift

@@ -37,7 +37,7 @@ final class TestOSTests: OSTest {
 		let bus = EventBus()
 		let drivers = Drivers.withEventBus(bus)
 		let sut = await TestOS(bios: .init(drivers: drivers))
-		try await sut.os.newWallet()
+		try await sut.os.newWallet(shouldPrederiveInstances: false)
 		let n = 3
 
 		let task = Task {
@@ -59,17 +59,17 @@ final class TestOSTests: OSTest {
 	}
 
 	func test_create_account_returned() async throws {
-		let sut = await TestOS()
-		try await sut.os.newWallet()
+        let sut = await TestOS()
+        try await sut.os.newWallet(shouldPrederiveInstances: false)
 		let displayName: DisplayName = "New"
 		let account = try await sut.createAccount(named: displayName)
 		XCTAssertEqual(account.displayName, displayName)
         XCTAssertEqual(try sut.accountsForDisplayOnCurrentNetwork, [AccountForDisplay(account)])
 	}
 
 	func test_create_account_returned_can_be_looked_up() async throws {
-		let sut = await TestOS()
-		try await sut.os.newWallet()
+        let sut = await TestOS.init()
+		try await sut.os.newWallet(shouldPrederiveInstances: false)
 		let displayName: DisplayName = "New"
 		let account = try await sut.createAccount(named: displayName)
 		let lookedUp = try sut.accountByAddress(account.address)
@@ -78,20 +78,20 @@ final class TestOSTests: OSTest {
 
 	func test_lookup_throws_for_unknown_accounts() async throws {
 		let sut = await TestOS()
-		try await sut.os.newWallet()
+		try await sut.os.newWallet(shouldPrederiveInstances: false)
 		XCTAssertThrowsError(try sut.accountByAddress(.sample))
 	}
 
 	func test_new_profile_has_preset_gateways() async throws {
 		let sut = await TestOS()
-		try await sut.os.newWallet()
+		try await sut.os.newWallet(shouldPrederiveInstances: false)
 		let gateways = try sut.gateways
 		XCTAssertEqual(gateways, .preset)
 	}
 
 	func test_if_replace_profile_throws() async throws {
 		let sut = await TestOS()
-		try await sut.os.newWallet()
+		try await sut.os.newWallet(shouldPrederiveInstances: false)
 		var profile = try sut.os.profile()
 		profile.header.id = ProfileID() // mutate profile
 		do {
@@ -104,19 +104,19 @@ final class TestOSTests: OSTest {
 
 	func test_we_can_mutate_profile_in_swift_and_save_then_profile_is_updated() async throws {
 		let sut = await TestOS()
-		try await sut.os.newWallet()
+		try await sut.os.newWallet(shouldPrederiveInstances: false)
 		var profile = try sut.os.profile()
 		let creatingDevice = profile.header.creatingDevice
 		let newCreatingDevice = DeviceInfo.sampleOther
 		XCTAssertNotEqual(newCreatingDevice, creatingDevice)
-		profile.header.creatingDevice = newCreatingDevice // mutate profile
+		profile.header.creatingDevice = newCreatingDevice // mutate profile 
 		try await sut.os.setProfile(profile: profile)
 		XCTAssertEqual(try sut.os.profile().header.creatingDevice, newCreatingDevice) // assert change worked
 	}
 
 	func test_batch_create_many_accounts() async throws {
 		let sut = await TestOS()
-		try await sut.os.newWallet()
+		try await sut.os.newWallet(shouldPrederiveInstances: false)
 		let n: UInt16 = 4
 		try await sut.batchCreateAccounts(count: n, namePrefix: "Unnamed")
 		XCTAssertEqual(try sut.accountsOnCurrentNetwork.map(\.displayName.value), (0..<n).map { "Unnamed \($0)" })

crates/sargon-uniffi/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sargon-uniffi"
 # Don't forget to update version in crates/sargon/Cargo.toml
-version = "1.1.51"
+version = "1.1.52"
 edition = "2021"
 build = "build.rs"
 
@@ -19,7 +19,7 @@ required-features = ["build-binary"]
 [dependencies]
 
 sargon = { path = "../sargon" }
-sargon-uniffi-conversion-macros = { path = "../sargon-uniffi-conversion-macros" } 
+sargon-uniffi-conversion-macros = { path = "../sargon-uniffi-conversion-macros" }
 
 radix-engine-toolkit = { git = "https://github.com/radixdlt/radix-engine-toolkit", rev = "263bc81f497f686b7327ffcc45fbaad6e04df85a" }