Merge pull request #161 from opentensor/fix/thewhaleking/hotkeypub-fix

Fix hotkeypub

Author: thewhaleking

src/wallet.rs

@@ -320,13 +320,13 @@ impl Wallet {
     pub fn hotkeypub_file(&self) -> Result<Keyfile, KeyFileError> {
         // concatenate wallet path
         let wallet_path = self._path.join(&self.name);
-
+        let hotkeypub_name = format!("{}pub.txt", self.hotkey);
         // concatenate hotkeypub path
-        let hotkeypub_path = wallet_path.join("hotkeypub.txt");
+        let hotkeypub_path = wallet_path.join("hotkeys").join(&hotkeypub_name);
 
         Keyfile::new(
             hotkeypub_path.to_string_lossy().into_owned(),
-            Some("hotkeypub.txt".to_string()),
+            Some(hotkeypub_name),
             false,
         )
     }
@@ -606,7 +606,7 @@ impl Wallet {
         let _hotkeypub = self
             ._hotkeypub
             .clone()
-            .ok_or_else(|| KeyFileError::Generic("Hotkey file doesn't exist.".to_string()))?;
+            .ok_or_else(|| KeyFileError::Generic("Hotkeypub file doesn't exist.".to_string()))?;
         Ok(_hotkeypub)
     }
 

tests/test_wallet.py

@@ -156,14 +156,18 @@ def test_unlock_coldkeypub(mock_wallet):
     """Verify that `unlock_coldkeypub` works correctly."""
     # Call
     coldkeypub = mock_wallet.unlock_coldkeypub()
-    hotkeypub = mock_wallet.unlock_hotkeypub()
 
     # Assertions
     assert coldkeypub.ss58_address == mock_wallet.get_coldkeypub().ss58_address
     assert coldkeypub.public_key == mock_wallet.get_coldkeypub().public_key
     assert coldkeypub.ss58_format == mock_wallet.get_coldkeypub().ss58_format
     assert coldkeypub.crypto_type == mock_wallet.get_coldkeypub().crypto_type
-
+    
+def test_unlock_hotkeypub(mock_wallet):
+    # Call
+    hotkeypub = mock_wallet.unlock_hotkeypub()
+    
+    # Assertations
     assert hotkeypub.ss58_address == mock_wallet.get_hotkeypub().ss58_address
     assert hotkeypub.public_key == mock_wallet.get_hotkeypub().public_key
     assert hotkeypub.ss58_format == mock_wallet.get_hotkeypub().ss58_format