Add swapper.supported_chains method

gemwalletcom · Nov 13, 2024 · 1b287fd · 1b287fd
1 parent 61e3c22
commit 1b287fd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/gemstone/src/swapper/mod.rs b/gemstone/src/swapper/mod.rs
@@ -13,11 +13,12 @@ mod uniswap;
 
 use models::*;
 use primitives::Chain;
+use std::collections::HashSet;
 
 #[async_trait]
 pub trait GemSwapProvider: Send + Sync + Debug {
     fn provider(&self) -> SwapProvider;
-    async fn supported_chains(&self) -> Result<Vec<Chain>, SwapperError>;
+    fn supported_chains(&self) -> Vec<Chain>;
     async fn fetch_quote(&self, request: &SwapQuoteRequest, provider: Arc<dyn AlienProvider>) -> Result<SwapQuote, SwapperError>;
     async fn fetch_quote_data(&self, quote: &SwapQuote, provider: Arc<dyn AlienProvider>, data: FetchQuoteData) -> Result<SwapQuoteData, SwapperError>;
     async fn get_transaction_status(&self, chain: Chain, transaction_hash: &str, provider: Arc<dyn AlienProvider>) -> Result<bool, SwapperError>;
@@ -39,8 +40,17 @@ impl GemSwapper {
         }
     }
 
-    fn get_providers(&self) -> Vec<String> {
-        self.swappers.iter().map(|x| x.provider().name().to_string()).collect()
+    fn supported_chains(&self) -> Vec<Chain> {
+        self.swappers
+            .iter()
+            .flat_map(|x| x.supported_chains())
+            .collect::<HashSet<_>>()
+            .into_iter()
+            .collect()
+    }
+
+    fn get_providers(&self) -> Vec<SwapProvider> {
+        self.swappers.iter().map(|x| x.provider()).collect()
     }
 
     async fn fetch_quote(&self, request: SwapQuoteRequest) -> Result<Vec<SwapQuote>, SwapperError> {

diff --git a/gemstone/src/swapper/models.rs b/gemstone/src/swapper/models.rs
@@ -69,7 +69,7 @@ pub struct SwapQuoteRequest {
 pub struct GemSwapOptions {
     pub slippage_bps: u32,
     pub fee: Option<SwapReferralFees>,
-    pub preferred_providers: Vec<String>,
+    pub preferred_providers: Vec<SwapProvider>,
 }
 
 impl Default for GemSwapOptions {

diff --git a/gemstone/src/swapper/thorchain/mod.rs b/gemstone/src/swapper/thorchain/mod.rs
@@ -57,12 +57,11 @@ impl GemSwapProvider for ThorChain {
         SwapProvider::Thorchain
     }
 
-    async fn supported_chains(&self) -> Result<Vec<Chain>, SwapperError> {
-        let chains: Vec<Chain> = Chain::all()
+    fn supported_chains(&self) -> Vec<Chain> {
+        Chain::all()
             .into_iter()
             .filter_map(|chain| THORChainName::from_chain(&chain).map(|name| name.chain()))
-            .collect();
-        Ok(chains)
+            .collect()
     }
 
     async fn fetch_quote(&self, request: &SwapQuoteRequest, provider: Arc<dyn AlienProvider>) -> Result<SwapQuote, SwapperError> {

diff --git a/gemstone/src/swapper/uniswap/mod.rs b/gemstone/src/swapper/uniswap/mod.rs
@@ -331,8 +331,8 @@ impl GemSwapProvider for UniswapV3 {
         SwapProvider::UniswapV3
     }
 
-    async fn supported_chains(&self) -> Result<Vec<Chain>, SwapperError> {
-        Ok(Chain::all().iter().filter(|x| self.support_chain(x)).cloned().collect())
+    fn supported_chains(&self) -> Vec<Chain> {
+        Chain::all().iter().filter(|x| self.support_chain(x)).cloned().collect()
     }
 
     async fn fetch_quote(&self, request: &SwapQuoteRequest, provider: Arc<dyn AlienProvider>) -> Result<SwapQuote, SwapperError> {