Switch to from env_logger to pretty_env_logger for colors.

Cargo.toml

@@ -4,7 +4,7 @@ members = ["profile"]
 
 [workspace.dependencies]
 log = "0.4.20"
-env_logger = "0.10.1"
+pretty_env_logger = "0.5.0"
 derive_more = { version = "1.0.0-beta.6", features = ["debug", "display"] }
 serde = { version = "1.0.193", features = ["derive"] }
 serde_json = { version = "1.0.108", features = ["preserve_order"] }

profile/Cargo.toml

@@ -27,7 +27,7 @@ enum-as-inner = { workspace = true }
 identified_vec = { workspace = true }
 schemars = { workspace = true }
 log = { workspace = true }
-env_logger = { workspace = true }
+pretty_env_logger = { workspace = true }
 uniffi = { workspace = true, features = ["cli"] }
 url = { git = "https://github.com/sajjon/rust-url", branch = "uniffi", features = [
     "serde",

profile/src/wallet/wallet.rs

@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use std::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
+use std::sync::{Once, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
 pub type HeadersList = IdentifiedVecVia<Header>;
 impl Identifiable for Header {
@@ -18,10 +18,57 @@ pub struct Wallet {
 
 impl Wallet {
     /// Initializes logging
-    fn init_logging(&self) {
-        // env_logger::init();
-        // Hmm ^^ not needed? already initialized?
-        // env_logger::init should not be called after logger initialized: SetLoggerError(())
+    fn init_logging() {
+        static ONCE: Once = Once::new();
+        ONCE.call_once(|| {
+            pretty_env_logger::formatted_builder()
+                .filter_level(log::LevelFilter::Info)
+                .try_init()
+                .expect("Should be able to setup a logger.");
+        });
+    }
+
+    fn with_imported_profile(profile: Profile, secure_storage: Arc<dyn SecureStorage>) -> Self {
+        // Init WalletClient's storage
+        let wallet_client_storage = WalletClientStorage::new(secure_storage);
+
+        // Init wallet
+        let wallet = Self {
+            profile: RwLock::new(profile.clone()),
+            wallet_client_storage,
+        };
+
+        // Save new profile (also sets activeProfileID)
+        wallet.save_new_profile_or_panic(&profile);
+
+        wallet
+    }
+
+    fn new_load_profile_with_id(
+        profile_id: ProfileID,
+        wallet_client_storage: WalletClientStorage,
+    ) -> Result<Self> {
+        // Form storage key
+        let profile_key = SecureStorageKey::ProfileSnapshot {
+            profile_id: profile_id.clone(),
+        };
+
+        // Load Profile from storage with key
+        let profile: Profile = wallet_client_storage.load_or(
+            profile_key,
+            CommonError::ProfileSnapshotNotFound(profile_id.clone()),
+        )?;
+
+        // Create wallet
+        let wallet = Self {
+            profile: RwLock::new(profile),
+            wallet_client_storage,
+        };
+
+        // Set active profile ID
+        wallet.save_active_profile_id(&profile_id)?;
+
+        Ok(wallet)
     }
 }
 
@@ -39,6 +86,10 @@ impl Wallet {
         wallet_client_name: String,
         secure_storage: Arc<dyn SecureStorage>,
     ) -> Result<Self> {
+        Wallet::init_logging();
+
+        log::info!("Instantiating Wallet by creating a new Profile from entropy (provided), for client: {}", wallet_client_model);
+
         let entropy_32bytes = Hex32Bytes::from_vec(entropy)?;
         let private_hd_factor_source =
             PrivateHierarchicalDeterministicFactorSource::new_with_entropy(
@@ -50,7 +101,7 @@ impl Wallet {
             private_hd_factor_source.clone(),
             wallet_client_name.as_str(),
         );
-        let wallet = Self::by_importing_profile(profile, secure_storage);
+        let wallet = Self::with_imported_profile(profile, secure_storage);
         wallet.wallet_client_storage.save(
             SecureStorageKey::DeviceFactorSourceMnemonic {
                 factor_source_id: private_hd_factor_source.factor_source.id.clone(),
@@ -63,25 +114,22 @@ impl Wallet {
     /// Creates wallet by *importing* a Profile.
     #[uniffi::constructor]
     pub fn by_importing_profile(profile: Profile, secure_storage: Arc<dyn SecureStorage>) -> Self {
-        // Init WalletClient's storage
-        let wallet_client_storage = WalletClientStorage::new(secure_storage);
+        Wallet::init_logging();
 
-        // Init wallet
-        let wallet = Self {
-            profile: RwLock::new(profile.clone()),
-            wallet_client_storage,
-        };
-
-        // Save new profile (also sets activeProfileID)
-        wallet.save_new_profile_or_panic(&profile);
+        log::info!(
+            "Instantiating Wallet by importing a Profile with ID: {}",
+            profile.id()
+        );
 
-        // Init logging
-        wallet.init_logging();
-        wallet
+        Self::with_imported_profile(profile, secure_storage)
     }
 
     #[uniffi::constructor]
     pub fn by_loading_profile(secure_storage: Arc<dyn SecureStorage>) -> Result<Self> {
+        Wallet::init_logging();
+
+        log::info!("Instantiating Wallet by loading the active Profile from storage");
+
         // Init WalletClient's storage
         let wallet_client_storage = WalletClientStorage::new(secure_storage);
 
@@ -99,39 +147,14 @@ impl Wallet {
         profile_id: ProfileID,
         secure_storage: Arc<dyn SecureStorage>,
     ) -> Result<Self> {
-        Self::new_load_profile_with_id(profile_id, WalletClientStorage::new(secure_storage))
-    }
-}
-
-impl Wallet {
-    fn new_load_profile_with_id(
-        profile_id: ProfileID,
-        wallet_client_storage: WalletClientStorage,
-    ) -> Result<Self> {
-        // Form storage key
-        let profile_key = SecureStorageKey::ProfileSnapshot {
-            profile_id: profile_id.clone(),
-        };
-
-        // Load Profile from storage with key
-        let profile: Profile = wallet_client_storage.load_or(
-            profile_key,
-            CommonError::ProfileSnapshotNotFound(profile_id.clone()),
-        )?;
-
-        // Create wallet
-        let wallet = Self {
-            profile: RwLock::new(profile),
-            wallet_client_storage,
-        };
+        Wallet::init_logging();
 
-        // Set active profile ID
-        wallet.save_active_profile_id(&profile_id)?;
-
-        // Init logging
-        wallet.init_logging();
+        log::info!(
+            "Instantiating Wallet by loading the Profile with ID {} from storage",
+            profile_id
+        );
 
-        Ok(wallet)
+        Self::new_load_profile_with_id(profile_id, WalletClientStorage::new(secure_storage))
     }
 }
 

profile/tests/uniffi/bindings/test_wallet.swift

@@ -139,6 +139,7 @@ extension Wallet {
 		entropy: Data,
 		iPhoneName: String = Wallet.defaultIphoneName
 	) throws -> Wallet {
+		// Rust: `by_creating_new_profile_and_secrets_with_entropy`
 		try Wallet.byCreatingNewProfileAndSecretsWithEntropy(
 			entropy: entropy,
 			walletClientModel: .iphone,