refactor(finance): remove a redundant function at CoinDTO

nolus-protocol · Sep 20, 2024 · a549f60 · a549f60
1 parent cd3666b
commit a549f60
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/platform/packages/finance/src/coin/dto/mod.rs b/platform/packages/finance/src/coin/dto/mod.rs
@@ -71,15 +71,6 @@ where
     }
 
     pub fn with_coin<V>(&self, cmd: V) -> StdResult<V::Output, V::Error>
-    where
-        V: WithCoin<G>,
-        G: Group<TopG = G>,
-    {
-        self.currency
-            .into_currency_type(CoinTransformerAny::new(self, cmd))
-    }
-
-    pub fn with_super_coin<V>(&self, cmd: V) -> StdResult<V::Output, V::Error>
     where
         V: WithCoin<G>,
         G: MemberOf<G>,

diff --git a/platform/packages/finance/src/price/base/with_price.rs b/platform/packages/finance/src/price/base/with_price.rs
@@ -37,7 +37,7 @@ where
     Cmd: WithPrice<QuoteC, PriceG = BaseG>,
     Cmd::Error: From<Error>,
 {
-    price.amount.with_super_coin(CoinResolve {
+    price.amount.with_coin(CoinResolve {
         price: UncheckedConversion::<BaseG, QuoteC>(PhantomData, price.amount_quote),
         cmd,
     })
@@ -56,7 +56,7 @@ where
     Cmd: WithPrice<QuoteC, PriceG = BaseG>,
     Cmd::Error: From<Error>,
 {
-    amount.with_super_coin(CoinResolve {
+    amount.with_coin(CoinResolve {
         price: CheckedConversion::<BaseG, QuoteC>(PhantomData, amount_quote),
         cmd,
     })

diff --git a/platform/packages/platform/src/coin_legacy.rs b/platform/packages/platform/src/coin_legacy.rs
@@ -101,7 +101,7 @@ where
             Ok(to_cosmwasm_on_network_impl::<C, S>(coin))
         }
     }
-    coin_dto.with_super_coin(CoinTransformer(PhantomData::<S>))
+    coin_dto.with_coin(CoinTransformer(PhantomData::<S>))
 }
 
 fn to_cosmwasm_on_network_impl<C, S>(coin: Coin<C>) -> CosmWasmCoin

diff --git a/protocol/contracts/lease/src/position/dto.rs b/protocol/contracts/lease/src/position/dto.rs
@@ -74,7 +74,7 @@ impl PositionDTO {
                     .and_then(|position| self.cmd.on(position))
             }
         }
-        self.amount.with_super_coin(WithAmount {
+        self.amount.with_coin(WithAmount {
             cmd,
             spec: self.spec,
         })

diff --git a/protocol/contracts/oracle/src/contract/oracle/feed/mod.rs b/protocol/contracts/oracle/src/contract/oracle/feed/mod.rs
@@ -53,8 +53,11 @@ where
                      from,
                      to: SwapTarget { target: to, .. },
                  }| {
-                    // TODO price.base().of_currency_dto(from) && ...
-                    price.base().currency() == from && price.quote().currency() == to
+                    price
+                        .base()
+                        .of_currency_dto(&from)
+                        .and_then(|()| price.quote().of_currency_dto(&to))
+                        .is_ok()
                 },
             )
         }) {

diff --git a/protocol/packages/dex/src/impl_/transfer_in.rs b/protocol/packages/dex/src/impl_/transfer_in.rs
@@ -43,7 +43,7 @@ where
         }
     }
 
-    payment.with_super_coin(CheckBalance::<G> {
+    payment.with_coin(CheckBalance::<G> {
         account,
         querier,
         currency_g: PhantomData,