From 6bcc82c82976a58dff8bf799d4dd845faa89dfa0 Mon Sep 17 00:00:00 2001
From: lunar-mining <ihateface@autistici.org>
Date: Sun, 3 Oct 2021 08:29:18 +0200
Subject: [PATCH] darkfid: added drk_tokenlist

---
 src/bin/darkfid.rs     | 20 +++++++++++---------
 src/util/token_list.rs |  1 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/bin/darkfid.rs b/src/bin/darkfid.rs
index 154ee93cd..8ba0b212f 100644
--- a/src/bin/darkfid.rs
+++ b/src/bin/darkfid.rs
@@ -28,7 +28,8 @@ use drk::{
 struct Darkfid {
     config: DarkfidConfig,
     client: Arc<Mutex<Client>>,
-    tokenlist: SolTokenList,
+    sol_tokenlist: SolTokenList,
+    drk_tokenlist: DrkTokenList,
 }
 
 #[async_trait]
@@ -77,13 +78,14 @@ impl Darkfid {
 
         let client = Arc::new(Mutex::new(client));
 
-        let tokenlist = SolTokenList::new()?;
-        let drk_tokenlist = DrkTokenList::new(tokenlist.clone())?;
+        let sol_tokenlist = SolTokenList::new()?;
+        let drk_tokenlist = DrkTokenList::new(sol_tokenlist.clone())?;
 
         Ok(Self {
             config,
             client,
-            tokenlist,
+            sol_tokenlist,
+            drk_tokenlist,
         })
     }
 
@@ -148,7 +150,7 @@ impl Darkfid {
         let symbol = symbol.unwrap();
 
         let result: Result<Value> = async {
-            let token_id = self.tokenlist.clone().search_id(symbol)?;
+            let token_id = self.sol_tokenlist.clone().search_id(symbol)?;
             Ok(json!(token_id))
         }
         .await;
@@ -209,7 +211,7 @@ impl Darkfid {
 
         let network = network.as_str().unwrap();
 
-        let token_id = match assign_id(&network, &token, self.tokenlist.clone()) {
+        let token_id = match assign_id(&network, &token, self.sol_tokenlist.clone()) {
             Ok(t) => t,
             Err(e) => {
                 debug!(target: "DARKFID", "TOKEN ID IS ERR");
@@ -285,7 +287,7 @@ impl Darkfid {
 
         let amount = amount.as_f64().unwrap();
 
-        let decimals = match decimals(network, token, self.tokenlist.clone()) {
+        let decimals = match decimals(network, token, self.sol_tokenlist.clone()) {
             Ok(d) => d,
             Err(e) => {
                 return JsonResult::Err(jsonerr(InternalError, Some(e.to_string()), id));
@@ -299,7 +301,7 @@ impl Darkfid {
             }
         };
 
-        let token_id = match assign_id(&network, &token, self.tokenlist.clone()) {
+        let token_id = match assign_id(&network, &token, self.sol_tokenlist.clone()) {
             Ok(t) => t,
             Err(e) => {
                 debug!(target: "DARKFID", "TOKEN ID IS ERR");
@@ -393,7 +395,7 @@ impl Darkfid {
 
         //let token_vec = self.wallet.get_token_ids();
 
-        //for (network_name, token_id) in self.tokenlist.drk_tokenlist.iter() {}
+        //for (network_name, token_id) in self.drk_tokenlist.iter() {}
 
         if address.as_str().is_none() {
             return JsonResult::Err(jsonerr(InvalidAddressParam, None, id));
diff --git a/src/util/token_list.rs b/src/util/token_list.rs
index 63936cd7d..58548ddd4 100644
--- a/src/util/token_list.rs
+++ b/src/util/token_list.rs
@@ -78,6 +78,7 @@ impl DrkTokenList {
     pub fn new(list: SolTokenList) -> Result<Self> {
         let mut drk_tokenlist = HashMap::new();
         let symbols = list.clone().get_symbols()?;
+
         for symbol in symbols {
             let id = list.clone().search_id(&symbol)?;
             let drk_id = generate_id(&id, &NetworkName::Solana)?;