From e8ac6f18f4b1e2273fc6604cdc74025886e2e390 Mon Sep 17 00:00:00 2001
From: Chris Duncan <chris@zoso.dev>
Date: Sun, 20 Jul 2025 22:16:56 -0700
Subject: [PATCH] Adjust naming for safe methods again.

---
 src/lib/account.ts        |  4 ++--
 src/lib/wallets/wallet.ts |  4 ++--
 src/lib/workers/safe.ts   | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lib/account.ts b/src/lib/account.ts
index 811790f..28cae56 100644
--- a/src/lib/account.ts
+++ b/src/lib/account.ts
@@ -328,7 +328,7 @@ export class Account {
 		}
 		try {
 			const response = await SafeWorker.assign<ArrayBuffer>({
-				method: 'fetchEncrypted',
+				method: 'fetch',
 				name: this.publicKey,
 				store: 'Account',
 				password: password.buffer
@@ -358,7 +358,7 @@ export class Account {
 
 		const accounts: Account[] = []
 		const privateAccounts: NamedData = {
-			method: 'storeEncrypted',
+			method: 'store',
 			store: 'Account',
 			password: password.buffer
 		}
diff --git a/src/lib/wallets/wallet.ts b/src/lib/wallets/wallet.ts
index 38fed2c..176ce7c 100644
--- a/src/lib/wallets/wallet.ts
+++ b/src/lib/wallets/wallet.ts
@@ -170,7 +170,7 @@ export abstract class Wallet {
 			})
 			const encoded = utf8.toBytes(serialized)
 			const success = await SafeWorker.assign({
-				method: 'storeEncrypted',
+				method: 'store',
 				store: 'Wallet',
 				[this.id]: encoded.buffer,
 				password: password.buffer
@@ -231,7 +231,7 @@ export abstract class Wallet {
 		}
 		try {
 			const response = await SafeWorker.assign<ArrayBuffer>({
-				method: 'fetchEncrypted',
+				method: 'fetch',
 				name: this.id,
 				store: 'Wallet',
 				password: password.buffer
diff --git a/src/lib/workers/safe.ts b/src/lib/workers/safe.ts
index 1ebcc06..4df0296 100644
--- a/src/lib/workers/safe.ts
+++ b/src/lib/workers/safe.ts
@@ -41,11 +41,11 @@ export class Safe extends WorkerInterface {
 		this.#storage = await this.#open(this.DB_NAME)
 		try {
 			switch (method) {
-				case 'storeEncrypted': {
-					return { result: await this.storeEncrypted(data, store, password) }
+				case 'store': {
+					return { result: await this.store(data, store, password) }
 				}
-				case 'fetchEncrypted': {
-					return await this.fetchEncrypted(name, store, password)
+				case 'fetch': {
+					return await this.fetch(name, store, password)
 				}
 				case 'destroy': {
 					return { result: await this.destroy(name, store) }
@@ -75,7 +75,7 @@ export class Safe extends WorkerInterface {
 	/**
 	* Encrypts data with a password byte array and stores it in the Safe.
 	*/
-	static async storeEncrypted (data: NamedData | unknown, store: string | unknown, password: ArrayBuffer | unknown): Promise<boolean> {
+	static async store (data: NamedData | unknown, store: string | unknown, password: ArrayBuffer | unknown): Promise<boolean> {
 		this.#isDataValid(data)
 		if (typeof store !== 'string' || store === '') {
 			throw new Error('Invalid database store name')
@@ -110,7 +110,7 @@ export class Safe extends WorkerInterface {
 	/**
 	* Retrieves data from the Safe and decrypts it with a password byte array.
 	*/
-	static async fetchEncrypted (name: string | string[] | unknown, store: string | unknown, password: ArrayBuffer | unknown): Promise<NamedData<ArrayBuffer>> {
+	static async fetch (name: string | string[] | unknown, store: string | unknown, password: ArrayBuffer | unknown): Promise<NamedData<ArrayBuffer>> {
 		const names = Array.isArray(name) ? name : [name]
 		if (names.some(v => typeof v !== 'string')) {
 			throw new Error('Invalid fields')
-- 
2.47.3