From 4feec780d4f82c777772a010373f9a9bd9d56e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C8=99u?= <bogdan@nymtech.net>
Date: Mon, 17 Jan 2022 17:39:21 +0200
Subject: [PATCH] Use fn new() for Account

---
 .../src/operations/mixnet/account.rs          | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/nym-wallet/src-tauri/src/operations/mixnet/account.rs b/nym-wallet/src-tauri/src/operations/mixnet/account.rs
index 803e74d86f..1fbfa653c6 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/account.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/account.rs
@@ -20,6 +20,16 @@ pub struct Account {
   denom: Denom,
 }
 
+impl Account {
+  pub fn new(contract_address: String, client_address: String, denom: Denom) -> Self {
+    Account {
+      contract_address,
+      client_address,
+      denom,
+    }
+  }
+}
+
 #[cfg_attr(test, derive(ts_rs::TS))]
 #[derive(Serialize, Deserialize)]
 pub struct Balance {
@@ -79,15 +89,11 @@ pub async fn switch_network(
     let r_state = state.read().await;
     let client = r_state.client(network)?;
 
-    let contract_address = client.nymd.mixnet_contract_address()?.to_string();
-    let client_address = client.nymd.address().to_string();
-    let denom = client.nymd.denom()?;
-
-    Account {
-      contract_address,
-      client_address,
-      denom: denom.try_into()?,
-    }
+    Account::new(
+      client.nymd.mixnet_contract_address()?.to_string(),
+      client.nymd.address().to_string(),
+      client.nymd.denom()?.try_into()?,
+    )
   };
 
   let mut w_state = state.write().await;
@@ -125,15 +131,11 @@ async fn _connect_with_mnemonic(
     };
 
     if network == default_network {
-      let contract_address = client.nymd.mixnet_contract_address()?.to_string();
-      let client_address = client.nymd.address().to_string();
-      let denom = client.nymd.denom()?;
-
-      default_account = Some(Account {
-        contract_address,
-        client_address,
-        denom: denom.try_into()?,
-      });
+      default_account = Some(Account::new(
+        client.nymd.mixnet_contract_address()?.to_string(),
+        client.nymd.address().to_string(),
+        client.nymd.denom()?.try_into()?,
+      ));
     }
 
     let mut w_state = state.write().await;