fix(wallet): fix wallet_setting keys

base_layer/wallet/migrations/2022-11-29-113713_fix_up_settings_keys/down.sql

@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`

base_layer/wallet/migrations/2022-11-29-113713_fix_up_settings_keys/up.sql

@@ -0,0 +1,6 @@
+-- Your SQL goes here
+UPDATE wallet_settings SET key = 'NodeFeatures' WHERE key = 'Nod features';
+UPDATE wallet_settings SET key = 'ClientKey.recovery_data' WHERE key = 'ClientKey: "recovery_data"';
+UPDATE wallet_settings SET key = 'ClientKey.console_wallet_custom_base_node_public_key' WHERE key = 'ClientKey: "console_wallet_custom_base_node_public_key"';
+UPDATE wallet_settings SET key = 'ClientKey.console_wallet_custom_base_node_address' WHERE key = 'ClientKey: "console_wallet_custom_base_node_address"';
+UPDATE wallet_settings SET key = 'BaseNodeChainMetadata' WHERE key = 'Last seen Chain metadata from basw node';

base_layer/wallet/src/error.rs

@@ -135,7 +135,7 @@ pub enum WalletStorageError {
     DieselConnectionError(#[from] diesel::ConnectionError),
     #[error("Database migration error")]
     DatabaseMigrationError(String),
-    #[error("Value not found: `{0}`")]
+    #[error("Value not found: `{}`", .0.to_key_string())]
     ValueNotFound(DbKey),
     #[error("Unexpected result: `{0}`")]
     UnexpectedResult(String),

base_layer/wallet/src/storage/database.rs

@@ -79,6 +79,23 @@ pub enum DbKey {
     WalletBirthday,
 }
 
+impl DbKey {
+    pub fn to_key_string(&self) -> String {
+        match self {
+            DbKey::MasterSeed => "MasterSeed".to_string(),
+            DbKey::CommsAddress => "CommsAddress".to_string(),
+            DbKey::CommsFeatures => "NodeFeatures".to_string(),
+            DbKey::TorId => "TorId".to_string(),
+            DbKey::ClientKey(k) => format!("ClientKey.{}", k),
+            DbKey::BaseNodeChainMetadata => "BaseNodeChainMetadata".to_string(),
+            DbKey::PassphraseHash => "PassphraseHash".to_string(),
+            DbKey::EncryptionSalt => "EncryptionSalt".to_string(),
+            DbKey::WalletBirthday => "WalletBirthday".to_string(),
+            DbKey::CommsIdentitySignature => "CommsIdentitySignature".to_string(),
+        }
+    }
+}
+
 pub enum DbValue {
     CommsAddress(Multiaddr),
     CommsFeatures(PeerFeatures),
@@ -320,23 +337,6 @@ where T: WalletBackend + 'static
     }
 }
 
-impl Display for DbKey {
-    fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
-        match self {
-            DbKey::MasterSeed => f.write_str("MasterSeed"),
-            DbKey::CommsAddress => f.write_str("CommsAddress"),
-            DbKey::CommsFeatures => f.write_str("Nod features"),
-            DbKey::TorId => f.write_str("TorId"),
-            DbKey::ClientKey(k) => f.write_str(&format!("ClientKey: {:?}", k)),
-            DbKey::BaseNodeChainMetadata => f.write_str("Last seen Chain metadata from basw node"),
-            DbKey::PassphraseHash => f.write_str("PassphraseHash"),
-            DbKey::EncryptionSalt => f.write_str("EncryptionSalt"),
-            DbKey::WalletBirthday => f.write_str("WalletBirthday"),
-            DbKey::CommsIdentitySignature => f.write_str("CommsIdentitySignature"),
-        }
-    }
-}
-
 impl Display for DbValue {
     fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
         match self {
@@ -359,14 +359,18 @@ fn log_error<T>(req: DbKey, err: WalletStorageError) -> Result<T, WalletStorageE
     error!(
         target: LOG_TARGET,
         "Database access error on request: {}: {}",
-        req,
+        req.to_key_string(),
         err.to_string()
     );
     Err(err)
 }
 
 fn unexpected_result<T>(req: DbKey, res: DbValue) -> Result<T, WalletStorageError> {
-    let msg = format!("Unexpected result for database query {}. Response: {}", req, res);
+    let msg = format!(
+        "Unexpected result for database query {}. Response: {}",
+        req.to_key_string(),
+        res
+    );
     error!(target: LOG_TARGET, "{}", msg);
     Err(WalletStorageError::UnexpectedResult(msg))
 }