ghassmo 4 лет назад
Родитель
Сommit
b29d858ea9
2 измененных файлов с 4 добавлено и 8 удалено
  1. 2 4
      src/bin/darkfid.rs
  2. 2 4
      src/util/parse.rs

+ 2 - 4
src/bin/darkfid.rs

@@ -37,6 +37,8 @@ use darkfi::{
     Error, Result,
 };
 
+pub const ETH_NATIVE_TOKEN_ID: &str = "0x0000000000000000000000000000000000000000";
+
 #[derive(Clone, Debug)]
 pub struct Cashier {
     pub name: String,
@@ -395,7 +397,6 @@ impl Darkfid {
         let result: Result<Value> = async {
             let network = NetworkName::from_str(network)?;
             match network {
-                #[cfg(feature = "sol")]
                 NetworkName::Solana => {
                     if let Some(tkn) = self.sol_tokenlist.search_id(symbol)? {
                         Ok(json!(tkn))
@@ -403,7 +404,6 @@ impl Darkfid {
                         Err(Error::NotSupportedToken)
                     }
                 }
-                #[cfg(feature = "btc")]
                 NetworkName::Bitcoin => {
                     if let Some(tkn) = self.btc_tokenlist.search_id(symbol)? {
                         Ok(json!(tkn))
@@ -411,10 +411,8 @@ impl Darkfid {
                         Err(Error::NotSupportedToken)
                     }
                 }
-                #[cfg(feature = "eth")]
                 NetworkName::Ethereum => {
                     if symbol.to_lowercase() == "eth" {
-                        use drk::service::eth::ETH_NATIVE_TOKEN_ID;
                         Ok(json!(ETH_NATIVE_TOKEN_ID.to_string()))
                     } else if let Some(tkn) = self.eth_tokenlist.search_id(symbol)? {
                         Ok(json!(tkn))

+ 2 - 4
src/util/parse.rs

@@ -10,6 +10,8 @@ use crate::{
     Error, Result,
 };
 
+pub const ETH_NATIVE_TOKEN_ID: &str = "0x0000000000000000000000000000000000000000";
+
 // hash the external token ID and NetworkName param.
 // if fails, change the last 4 bytes and hash it again. keep repeating until it works.
 pub fn generate_id(tkn_str: &str, network: &NetworkName) -> Result<DrkTokenId> {
@@ -81,7 +83,6 @@ pub fn assign_id(
     btc_tokenlist: &TokenList,
 ) -> Result<String> {
     match network {
-        #[cfg(feature = "sol")]
         NetworkName::Solana => {
             // (== 44) can represent a Solana base58 token mint address
             if token.len() == 44 {
@@ -91,7 +92,6 @@ pub fn assign_id(
                 symbol_to_id(&tok_lower, sol_tokenlist)
             }
         }
-        #[cfg(feature = "btc")]
         NetworkName::Bitcoin => {
             if token.len() == 34 {
                 Ok(token.to_string())
@@ -100,9 +100,7 @@ pub fn assign_id(
                 symbol_to_id(&tok_lower, btc_tokenlist)
             }
         }
-        #[cfg(feature = "eth")]
         NetworkName::Ethereum => {
-            use crate::service::eth::ETH_NATIVE_TOKEN_ID;
             // (== 42) can represent a erc20 token mint address
             if token.len() == 42 {
                 Ok(token.to_string())