Deduplicate flagged storage entry helpers

(cherry picked from commit e78f103)

Author: ndycode

lib/storage.ts

@@ -21,8 +21,7 @@ import {
 	describeAccountSnapshot as describeAccountSnapshotWithDeps,
 	statSnapshot as statSnapshotWithDeps,
 } from "./storage/account-snapshot.js";
-import {
-	exportAccountsSnapshot,
+exportAccountsSnapshot,
 	importAccountsSnapshot,
 } from "./storage/account-port.js";
 import { saveAccountsToDisk } from "./storage/account-save.js";

lib/storage/account-port.ts

@@ -1,4 +1,4 @@
-import type { AccountStorageV3, FlaggedAccountStorageV1 } from "../storage.js";
+import type { AccountStorageV3 } from "../storage.js";
 
 export async function exportAccountsSnapshot(params: {
 	resolvedPath: string;
@@ -103,35 +103,3 @@ export async function importAccountsSnapshot(params: {
 	return result;
 }
 
-export async function saveFlaggedAccountsEntry(params: {
-	storage: FlaggedAccountStorageV1;
-	withStorageLock: <T>(fn: () => Promise<T>) => Promise<T>;
-	saveUnlocked: (storage: FlaggedAccountStorageV1) => Promise<void>;
-}): Promise<void> {
-	return params.withStorageLock(async () => {
-		await params.saveUnlocked(params.storage);
-	});
-}
-
-export async function clearFlaggedAccountsEntry(params: {
-	path: string;
-	withStorageLock: <T>(fn: () => Promise<T>) => Promise<T>;
-	markerPath: string;
-	getBackupPaths: () => Promise<string[]>;
-	clearFlaggedAccountsOnDisk: (args: {
-		path: string;
-		markerPath: string;
-		backupPaths: string[];
-		logError: (message: string, details: Record<string, unknown>) => void;
-	}) => Promise<void>;
-	logError: (message: string, details: Record<string, unknown>) => void;
-}): Promise<void> {
-	return params.withStorageLock(async () => {
-		await params.clearFlaggedAccountsOnDisk({
-			path: params.path,
-			markerPath: params.markerPath,
-			backupPaths: await params.getBackupPaths(),
-			logError: params.logError,
-		});
-	});
-}

test/account-port.test.ts

@@ -1,35 +1,10 @@
 import { describe, expect, it, vi } from "vitest";
 import {
-	clearFlaggedAccountsEntry,
 	exportAccountsSnapshot,
 	importAccountsSnapshot,
-	saveFlaggedAccountsEntry,
 } from "../lib/storage/account-port.js";
 
 describe("account port helpers", () => {
-	it("delegates flagged save through storage lock", async () => {
-		const saveUnlocked = vi.fn(async () => undefined);
-		await saveFlaggedAccountsEntry({
-			storage: { version: 1, accounts: [] },
-			withStorageLock: async (fn) => fn(),
-			saveUnlocked,
-		});
-		expect(saveUnlocked).toHaveBeenCalled();
-	});
-
-	it("delegates flagged clear through storage lock", async () => {
-		const clearFlaggedAccountsOnDisk = vi.fn(async () => undefined);
-		await clearFlaggedAccountsEntry({
-			path: "/tmp/flagged.json",
-			withStorageLock: async (fn) => fn(),
-			markerPath: "/tmp/flagged.reset",
-			getBackupPaths: async () => ["/tmp/flagged.json.bak"],
-			clearFlaggedAccountsOnDisk,
-			logError: vi.fn(),
-		});
-		expect(clearFlaggedAccountsOnDisk).toHaveBeenCalled();
-	});
-
 	it("exports transaction snapshot when active", async () => {
 		const exportAccountsToFile = vi.fn(async () => undefined);
 		await exportAccountsSnapshot({