cleanup

tangle-network · Jan 26, 2025 · 8274238 · 8274238
1 parent c3cb573
commit 8274238
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 60 deletions.
diff --git a/pallets/multi-asset-delegation/src/types.rs b/pallets/multi-asset-delegation/src/types.rs
@@ -25,11 +25,9 @@ use tangle_primitives::types::RoundIndex;
 
 pub mod delegator;
 pub mod operator;
-pub mod rewards;
 
 pub use delegator::*;
 pub use operator::*;
-pub use rewards::*;
 
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;

diff --git a/pallets/multi-asset-delegation/src/types/rewards.rs b/pallets/multi-asset-delegation/src/types/rewards.rs
diff --git a/pallets/rewards/src/functions/mod.rs b/pallets/rewards/src/functions/mod.rs
@@ -15,27 +15,15 @@
 // along with Tangle.  If not, see <http://www.gnu.org/licenses/>.
 use crate::RewardVaultsPotAccount;
 use crate::SubaccountType;
-use crate::{
-	ApyBlocks, AssetLookupRewardVaults, BalanceOf, Config, Error, Event, Pallet,
-	RewardConfigForAssetVault, RewardConfigStorage, RewardVaults, TotalRewardVaultDeposit,
-	TotalRewardVaultScore, UserClaimedReward,
-};
+use crate::{AssetLookupRewardVaults, Config, Error, Pallet, RewardVaults};
+use frame_support::ensure;
 use frame_support::traits::Get;
-use frame_support::{ensure, traits::Currency};
-use frame_system::pallet_prelude::BlockNumberFor;
-use scale_info::prelude::vec;
 use sp_runtime::traits::AccountIdConversion;
-use sp_runtime::{
-	traits::{CheckedMul, Saturating, Zero},
-	DispatchError, DispatchResult, Percent, SaturatedConversion,
-};
+use sp_runtime::{DispatchError, DispatchResult};
 use sp_std::vec::Vec;
-use tangle_primitives::{
-	services::Asset, traits::MultiAssetDelegationInfo, types::rewards::UserDepositWithLocks,
-};
+use tangle_primitives::services::Asset;
 
 pub mod rewards;
-pub use rewards::*;
 
 impl<T: Config> Pallet<T> {
 	pub fn remove_asset_from_vault(

diff --git a/pallets/rewards/src/functions/rewards.rs b/pallets/rewards/src/functions/rewards.rs
@@ -16,17 +16,14 @@
 use crate::DecayRate;
 use crate::DecayStartPeriod;
 use crate::RewardVaultsPotAccount;
-use crate::SubaccountType;
 use crate::{
 	ApyBlocks, AssetLookupRewardVaults, BalanceOf, Config, Error, Event, Pallet,
-	RewardConfigForAssetVault, RewardConfigStorage, RewardVaults, TotalRewardVaultDeposit,
-	TotalRewardVaultScore, UserClaimedReward,
+	RewardConfigForAssetVault, RewardConfigStorage, TotalRewardVaultDeposit, TotalRewardVaultScore,
+	UserClaimedReward,
 };
-use frame_support::traits::Get;
 use frame_support::{ensure, traits::Currency};
 use frame_system::pallet_prelude::BlockNumberFor;
 use scale_info::prelude::vec;
-use sp_runtime::traits::AccountIdConversion;
 use sp_runtime::{
 	traits::{CheckedMul, Saturating, Zero},
 	DispatchError, DispatchResult, Percent, SaturatedConversion,

diff --git a/pallets/rewards/src/tests/claim.rs b/pallets/rewards/src/tests/claim.rs
@@ -3,12 +3,11 @@ use crate::BalanceOf;
 use crate::RewardConfigForAssetVault;
 use crate::UserClaimedReward;
 use crate::{
-	mock::*, tests::reward_calc::setup_test_env, Config, DecayRate, DecayStartPeriod, Error, Event,
+	mock::*, tests::reward_calc::setup_test_env, DecayRate, DecayStartPeriod, Error,
 	Pallet as RewardsPallet, TotalRewardVaultDeposit, TotalRewardVaultScore,
 };
 use frame_support::assert_noop;
 use frame_support::{assert_ok, traits::Currency};
-use sp_core::sr25519;
 use sp_runtime::Percent;
 use tangle_primitives::rewards::UserDepositWithLocks;
 use tangle_primitives::{

diff --git a/pallets/rewards/src/tests/reward_calc.rs b/pallets/rewards/src/tests/reward_calc.rs
@@ -508,7 +508,7 @@ fn test_decay_rate_works_as_expected() {
 
 		// Calculate expected rewards:
 		// 1. Total annual rewards = 100M * 1% APY * 95% (after decay)
-		let base_rewards = (MOCK_TOTAL_ISSUANCE as u128) * (MOCK_APY as u128) / 100;
+		let base_rewards = MOCK_TOTAL_ISSUANCE * (MOCK_APY as u128) / 100;
 		let total_annual_rewards = base_rewards * 95 / 100;
 
 		// 2. Per block rewards = total annual rewards / blocks per year