LPv2: ForeignInvestments changes

Cargo.toml

@@ -35,7 +35,6 @@ members = [
   "pallets/restricted-tokens",
   "pallets/restricted-xtokens",
   "pallets/rewards",
-  "pallets/swaps",
   "pallets/token-mux",
   "pallets/transfer-allowlist",
   "runtime/altair",
@@ -249,7 +248,6 @@ pallet-pool-system = { path = "pallets/pool-system", default-features = false }
 pallet-restricted-tokens = { path = "pallets/restricted-tokens", default-features = false }
 pallet-restricted-xtokens = { path = "pallets/restricted-xtokens", default-features = false }
 pallet-rewards = { path = "pallets/rewards", default-features = false }
-pallet-swaps = { path = "pallets/swaps", default-features = false }
 pallet-token-mux = { path = "pallets/token-mux", default-features = false }
 pallet-transfer-allowlist = { path = "pallets/transfer-allowlist", default-features = false }
 

libs/mocks/src/foreign_investment.rs

@@ -26,11 +26,10 @@ pub mod pallet {
 			register_call!(move |(a, b, c, d)| f(a, b, c, d));
 		}
 
-		pub fn mock_decrease_foreign_investment(
-			f: impl Fn(&T::AccountId, T::InvestmentId, T::Amount, T::CurrencyId) -> DispatchResult
-				+ 'static,
+		pub fn mock_cancel_foreign_investment(
+			f: impl Fn(&T::AccountId, T::InvestmentId, T::CurrencyId) -> DispatchResult + 'static,
 		) {
-			register_call!(move |(a, b, c, d)| f(a, b, c, d));
+			register_call!(move |(a, b, c)| f(a, b, c));
 		}
 
 		pub fn mock_increase_foreign_redemption(
@@ -45,48 +44,21 @@ pub mod pallet {
 			register_call!(move |(a, b, c, d)| f(a, b, c, d));
 		}
 
-		pub fn mock_decrease_foreign_redemption(
+		pub fn mock_cancel_foreign_redemption(
 			f: impl Fn(
 					&T::AccountId,
 					T::InvestmentId,
-					T::TrancheAmount,
 					T::CurrencyId,
-				) -> DispatchResult
+				) -> Result<T::TrancheAmount, DispatchError>
 				+ 'static,
-		) {
-			register_call!(move |(a, b, c, d)| f(a, b, c, d));
-		}
-
-		pub fn mock_collect_foreign_investment(
-			f: impl Fn(&T::AccountId, T::InvestmentId, T::CurrencyId) -> DispatchResult + 'static,
 		) {
 			register_call!(move |(a, b, c)| f(a, b, c));
 		}
-
-		pub fn mock_collect_foreign_redemption(
-			f: impl Fn(&T::AccountId, T::InvestmentId, T::CurrencyId) -> DispatchResult + 'static,
-		) {
-			register_call!(move |(a, b, c)| f(a, b, c));
-		}
-
-		pub fn mock_investment(
-			f: impl Fn(&T::AccountId, T::InvestmentId) -> Result<T::Amount, DispatchError> + 'static,
-		) {
-			register_call!(move |(a, b)| f(a, b));
-		}
-
-		pub fn mock_redemption(
-			f: impl Fn(&T::AccountId, T::InvestmentId) -> Result<T::TrancheAmount, DispatchError>
-				+ 'static,
-		) {
-			register_call!(move |(a, b)| f(a, b));
-		}
 	}
 
 	impl<T: Config> ForeignInvestment<T::AccountId> for Pallet<T> {
 		type Amount = T::Amount;
 		type CurrencyId = T::CurrencyId;
-		type Error = DispatchError;
 		type InvestmentId = T::InvestmentId;
 		type TrancheAmount = T::TrancheAmount;
 
@@ -99,13 +71,12 @@ pub mod pallet {
 			execute_call!((a, b, c, d))
 		}
 
-		fn decrease_foreign_investment(
+		fn cancel_foreign_investment(
 			a: &T::AccountId,
 			b: Self::InvestmentId,
-			c: Self::Amount,
-			d: Self::CurrencyId,
+			c: Self::CurrencyId,
 		) -> DispatchResult {
-			execute_call!((a, b, c, d))
+			execute_call!((a, b, c))
 		}
 
 		fn increase_foreign_redemption(
@@ -117,43 +88,12 @@ pub mod pallet {
 			execute_call!((a, b, c, d))
 		}
 
-		fn decrease_foreign_redemption(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-			c: Self::TrancheAmount,
-			d: Self::CurrencyId,
-		) -> DispatchResult {
-			execute_call!((a, b, c, d))
-		}
-
-		fn collect_foreign_investment(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-			c: Self::CurrencyId,
-		) -> DispatchResult {
-			execute_call!((a, b, c))
-		}
-
-		fn collect_foreign_redemption(
+		fn cancel_foreign_redemption(
 			a: &T::AccountId,
 			b: Self::InvestmentId,
 			c: Self::CurrencyId,
-		) -> DispatchResult {
+		) -> Result<T::TrancheAmount, DispatchError> {
 			execute_call!((a, b, c))
 		}
-
-		fn investment(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-		) -> Result<Self::Amount, DispatchError> {
-			execute_call!((a, b))
-		}
-
-		fn redemption(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-		) -> Result<Self::TrancheAmount, DispatchError> {
-			execute_call!((a, b))
-		}
 	}
 }

libs/mocks/src/foreign_investment_hooks.rs

@@ -0,0 +1,101 @@
+#[frame_support::pallet(dev_mode)]
+pub mod pallet {
+	use cfg_traits::investments::ForeignInvestmentHooks;
+	use frame_support::pallet_prelude::*;
+	use mock_builder::{execute_call, register_call};
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type Amount;
+		type TrancheAmount;
+		type CurrencyId;
+		type InvestmentId;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::storage]
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
+
+	impl<T: Config> Pallet<T> {
+		pub fn mock_fulfill_cancel_investment(
+			f: impl Fn(
+					&T::AccountId,
+					T::InvestmentId,
+					T::CurrencyId,
+					T::Amount,
+					T::Amount,
+				) -> DispatchResult
+				+ 'static,
+		) {
+			register_call!(move |(a, b, c, d, e)| f(a, b, c, d, e));
+		}
+
+		pub fn mock_fulfill_collect_investment(
+			f: impl Fn(
+					&T::AccountId,
+					T::InvestmentId,
+					T::CurrencyId,
+					T::Amount,
+					T::TrancheAmount,
+				) -> DispatchResult
+				+ 'static,
+		) {
+			register_call!(move |(a, b, c, d, e)| f(a, b, c, d, e));
+		}
+
+		pub fn mock_fulfill_collect_redemption(
+			f: impl Fn(
+					&T::AccountId,
+					T::InvestmentId,
+					T::CurrencyId,
+					T::TrancheAmount,
+					T::Amount,
+				) -> DispatchResult
+				+ 'static,
+		) {
+			register_call!(move |(a, b, c, d, e)| f(a, b, c, d, e));
+		}
+	}
+
+	impl<T: Config> ForeignInvestmentHooks<T::AccountId> for Pallet<T> {
+		type Amount = T::Amount;
+		type CurrencyId = T::CurrencyId;
+		type InvestmentId = T::InvestmentId;
+		type TrancheAmount = T::TrancheAmount;
+
+		/// An async cancellation has been done
+		fn fulfill_cancel_investment(
+			a: &T::AccountId,
+			b: Self::InvestmentId,
+			c: Self::CurrencyId,
+			d: Self::Amount,
+			e: Self::Amount,
+		) -> DispatchResult {
+			execute_call!((a, b, c, d, e))
+		}
+
+		/// An async investment collection has been done
+		fn fulfill_collect_investment(
+			a: &T::AccountId,
+			b: Self::InvestmentId,
+			c: Self::CurrencyId,
+			d: Self::Amount,
+			e: Self::TrancheAmount,
+		) -> DispatchResult {
+			execute_call!((a, b, c, d, e))
+		}
+
+		/// An async redemption collection has been done
+		fn fulfill_collect_redemption(
+			a: &T::AccountId,
+			b: Self::InvestmentId,
+			c: Self::CurrencyId,
+			d: Self::TrancheAmount,
+			e: Self::Amount,
+		) -> DispatchResult {
+			execute_call!((a, b, c, d, e))
+		}
+	}
+}

libs/mocks/src/lib.rs

@@ -5,6 +5,7 @@ pub mod currency_conversion;
 pub mod data;
 pub mod fees;
 pub mod foreign_investment;
+pub mod foreign_investment_hooks;
 pub mod investment;
 pub mod liquidity_pools;
 pub mod liquidity_pools_gateway_routers;