From 06a5d8b46711ef63b05f908735e58207e7e73d23 Mon Sep 17 00:00:00 2001
From: Sosthene <contact@sosthene.net>
Date: Tue, 17 Dec 2024 11:52:53 +0100
Subject: [PATCH] Rename save and getDevice function more explicitly

---
 src/router.ts           |  2 +-
 src/services/service.ts | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/router.ts b/src/router.ts
index c18bd48..2e51714 100755
--- a/src/router.ts
+++ b/src/router.ts
@@ -136,7 +136,7 @@ export async function init(): Promise<void> {
     (window as any).myService = services;
     await Database.getInstance();
     setTimeout(async () => {
-      let device = await services.getDevice();
+      let device = await services.getDeviceFromDatabase();
       console.log('🚀 ~ setTimeout ~ device:', device);
 
       if (!device) {
diff --git a/src/services/service.ts b/src/services/service.ts
index 89b9a54..2351ccf 100755
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -77,8 +77,8 @@ export default class Services {
   public async unpairDevice(): Promise<void> {
     try {
       this.sdkClient.unpair_device();
-      const newDevice = this.dumpDevice();
-      await this.saveDevice(newDevice);
+      const newDevice = this.dumpDeviceFromMemory();
+      await this.saveDeviceInDatabase(newDevice);
     } catch (e) {
       throw new Error(`Failed to unpair device: ${e}`);
     }
@@ -251,8 +251,8 @@ export default class Services {
       if (parsedTx) {
         try {
           await this.handleApiReturn(parsedTx);
-          const newDevice = this.dumpDevice();
-          await this.saveDevice(newDevice);
+          const newDevice = this.dumpDeviceFromMemory();
+          await this.saveDeviceInDatabase(newDevice);
         } catch (e) {
           console.error('Failed to update device with new tx');
         }
@@ -411,7 +411,7 @@ export default class Services {
     return await this.sdkClient.get_address();
   }
 
-  public dumpDevice(): string {
+  public dumpDeviceFromMemory(): string {
     try {
       return this.sdkClient.dump_device();
     } catch (e) {
@@ -419,7 +419,7 @@ export default class Services {
     }
   }
 
-  async saveDevice(device: any): Promise<void> {
+  async saveDeviceInDatabase(device: any): Promise<void> {
     const db = await Database.getInstance();
     try {
       await db.addObject({
@@ -432,7 +432,7 @@ export default class Services {
     }
   }
 
-  async getDevice(): Promise<string | null> {
+  async getDeviceFromDatabase(): Promise<string | null> {
     const db = await Database.getInstance();
     try {
       const dbRes = await db.getObject('wallet', '1');
@@ -463,9 +463,9 @@ export default class Services {
     let spAddress = '';
     try {
       spAddress = await this.sdkClient.create_new_device(0, 'regtest');
-      const device = await this.dumpDevice();
+      const device = this.dumpDeviceFromMemory();
       console.log('🚀 ~ Services ~ device:', device);
-      await this.saveDevice(device);
+      await this.saveDeviceInDatabase(device);
     } catch (e) {
       console.error('Services ~ Error:', e);
     }