404 add pooled reward pallet

Cargo.toml

@@ -12,7 +12,7 @@ members = [
     "pallets/fee",
     "pallets/nomination",
     "pallets/oracle",
-    "pallets/reward",
+    "pallets/pooled-rewards",
     "pallets/reward-distribution",
     "pallets/staking",
     "pallets/stellar-relay",

pallets/currency/src/lib.rs

@@ -88,7 +88,8 @@ pub mod pallet {
 			+ FullCodec
 			+ Copy
 			+ Default
-			+ Debug;
+			+ Debug
+			+ From<u64>;
 
 		/// Relay chain currency e.g. DOT/KSM
 		#[pallet::constant]

pallets/currency/src/testing_constants.rs

@@ -14,6 +14,29 @@ pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = CurrencyId::AlphaNum4(
 	],
 );
 
+pub const DEFAULT_WRAPPED_CURRENCY_2: CurrencyId = CurrencyId::AlphaNum4(
+	*b"USDT",
+	[
+		20, 209, 150, 49, 176, 55, 23, 217, 171, 154, 54, 110, 16, 50, 30, 226, 102, 231, 46, 199,
+		108, 171, 97, 144, 240, 161, 51, 109, 72, 34, 159, 139,
+	],
+);
+pub const DEFAULT_WRAPPED_CURRENCY_3: CurrencyId = CurrencyId::AlphaNum4(
+	*b"MXN\0",
+	[
+		20, 209, 150, 49, 176, 55, 23, 217, 171, 154, 54, 110, 16, 50, 30, 226, 102, 231, 46, 199,
+		108, 171, 97, 144, 240, 161, 51, 109, 72, 34, 159, 139,
+	],
+);
+
+pub const DEFAULT_WRAPPED_CURRENCY_4: CurrencyId = CurrencyId::AlphaNum4(
+	*b"ARST",
+	[
+		44, 123, 1, 49, 176, 55, 23, 123, 171, 123, 54, 155, 16, 50, 30, 226, 155, 231, 46, 199, 1,
+		11, 4, 144, 240, 123, 51, 33, 72, 34, 159, 33,
+	],
+);
+
 pub fn get_wrapped_currency_id() -> CurrencyId {
 	DEFAULT_WRAPPED_CURRENCY
 }

pallets/fee/Cargo.toml

@@ -25,10 +25,14 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "p
 # Parachain dependencies
 currency = { path = "../currency", default-features = false }
 security = { path = "../security", default-features = false }
-reward = { path = "../reward", default-features = false }
+pooled-rewards = { path = "../pooled-rewards", default-features = false }
 staking = { path = "../staking", default-features = false }
+reward-distribution = { path = "../reward-distribution", default-features = false }
+oracle = { path = "../oracle", default-features = false }
+
 primitives = { package = "spacewalk-primitives", path = "../../primitives", default-features = false }
 
+
 [dev-dependencies]
 mocktopus = "0.8.0"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
@@ -58,12 +62,14 @@ std = [
     "pallet-balances/std",
     "currency/std",
     "security/std",
-    "reward/std",
     "staking/std",
     "primitives/std",
+    "pooled-rewards/std",
     "orml-currencies/std",
     "orml-tokens/std",
     "orml-traits/std",
+    "reward-distribution/std",
+    "oracle/std",
 ]
 runtime-benchmarks = [
     "frame-benchmarking",

pallets/fee/src/benchmarking.rs

@@ -1,9 +1,6 @@
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
 use frame_system::RawOrigin;
 
-use currency::getters::get_native_currency_id;
-use primitives::VaultId;
-
 #[cfg(test)]
 use crate::Pallet as Fee;
 
@@ -18,10 +15,6 @@ fn get_fee<T: crate::Config>() -> UnsignedFixedPoint<T> {
 }
 
 benchmarks! {
-	withdraw_rewards {
-		let nominator: T::AccountId = account("recipient", 0, SEED);
-		let vault_id: VaultId<_, CurrencyId<T>> = VaultId::new(nominator.clone(), get_native_currency_id::<T>(), get_native_currency_id::<T>());
-	}: _(RawOrigin::Signed(nominator), vault_id, None)
 
 	set_issue_fee {
 		let caller: T::AccountId = account("caller", 0, SEED);

pallets/fee/src/ext.rs

@@ -0,0 +1,17 @@
+#[cfg(test)]
+use mocktopus::macros::mockable;
+
+#[cfg_attr(test, mockable)]
+pub(crate) mod reward_distribution {
+	use crate::DispatchError;
+	use currency::Amount;
+	use reward_distribution::DistributeRewards;
+
+	pub fn distribute_rewards<T: crate::Config>(
+		reward: &Amount<T>,
+	) -> Result<Amount<T>, DispatchError> {
+		let undistributed_balance =
+			T::RewardDistribution::distribute_rewards(reward.amount(), reward.currency())?;
+		Ok(Amount::<T>::new(undistributed_balance, reward.currency()))
+	}
+}