Merge pull request #1623 from opentensor/feat/uniswapv3-lp-cleanup

Fix get_total_stake_for_hotkey

Author: ales-otf

pallets/subtensor/src/staking/helpers.rs

@@ -47,23 +47,15 @@ impl<T: Config> Pallet<T> {
         Self::get_all_subnet_netuids()
             .into_iter()
             .map(|netuid| {
-                let alpha = Self::get_stake_for_hotkey_on_subnet(hotkey, netuid);
-                T::SwapInterface::swap(
-                    netuid,
-                    OrderType::Sell,
-                    alpha,
-                    T::SwapInterface::max_price(),
-                    true,
-                )
-                .map(|r| {
-                    let fee: u64 = U96F32::saturating_from_num(r.fee_paid)
-                        .saturating_mul(T::SwapInterface::current_alpha_price(netuid))
-                        .saturating_to_num();
-                    r.amount_paid_out.saturating_add(fee)
-                })
-                .unwrap_or_default()
+                let alpha = U96F32::saturating_from_num(Self::get_stake_for_hotkey_on_subnet(
+                    hotkey, netuid,
+                ));
+                let alpha_price =
+                    U96F32::saturating_from_num(T::SwapInterface::current_alpha_price(netuid));
+                alpha.saturating_mul(alpha_price)
             })
-            .sum()
+            .sum::<U96F32>()
+            .saturating_to_num::<u64>()
     }
 
     // Returns the total amount of stake under a coldkey

pallets/subtensor/src/tests/epoch.rs

@@ -13,7 +13,6 @@ use sp_core::{Get, U256};
 use substrate_fixed::types::I32F32;
 use subtensor_swap_interface::SwapHandler;
 
-use super::mock;
 use super::mock::*;
 use crate::epoch::math::safe_exp;
 use crate::*;

pallets/subtensor/src/tests/recycle_alpha.rs

@@ -1,8 +1,6 @@
 use approx::assert_abs_diff_eq;
 use frame_support::{assert_noop, assert_ok, traits::Currency};
-use serde::de::Expected;
 use sp_core::U256;
-use sp_core::bytes::ExpectedLen;
 
 use super::mock;
 use super::mock::*;

pallets/subtensor/src/tests/registration.rs

@@ -8,7 +8,6 @@ use frame_support::{assert_err, assert_noop, assert_ok};
 use frame_system::Config;
 use sp_core::U256;
 use sp_runtime::traits::{DispatchInfoOf, SignedExtension};
-use subtensor_swap_interface::SwapHandler;
 
 use super::mock;
 use super::mock::*;

pallets/swap-interface/src/lib.rs

@@ -47,7 +47,6 @@ pub trait SwapHandler<AccountId> {
 pub struct SwapResult {
     pub amount_paid_out: u64,
     pub fee_paid: u64,
-    pub refund: u64,
     // calculated new tao/alpha reserves
     pub new_tao_reserve: u64,
     pub new_alpha_reserve: u64,