Merge branch 'main' into ci-rewrite-n-cache

Cargo.toml

@@ -44,6 +44,7 @@ members = [
   "pallets/crowdloan-reward",
   "pallets/ethereum-transaction",
   "pallets/fees",
+  "pallets/foreign-investments",
   "pallets/interest-accrual",
   "pallets/investments",
   "pallets/keystore",

libs/test-utils/src/mocks/accountant.rs

@@ -105,7 +105,7 @@ macro_rules! impl_mock_accountant {
 				pub payment_currency: $currency_id,
 			}
 
-			impl<Tokens> cfg_traits::InvestmentAccountant<$account_id> for $name<Tokens>
+			impl<Tokens> cfg_traits::investments::InvestmentAccountant<$account_id> for $name<Tokens>
 			where
 				Tokens: frame_support::traits::tokens::fungibles::Mutate<$account_id>
 					+ frame_support::traits::tokens::fungibles::Transfer<$account_id>
@@ -166,7 +166,7 @@ macro_rules! impl_mock_accountant {
 				}
 			}
 
-			impl cfg_traits::InvestmentProperties<$account_id> for InvestmentInfo {
+			impl cfg_traits::investments::InvestmentProperties<$account_id> for InvestmentInfo {
 				type Currency = $currency_id;
 				type Id = $investment_id;
 

libs/test-utils/src/mocks/order_manager.rs

@@ -14,7 +14,7 @@ pub use pallet::*;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use cfg_traits::{
+	use cfg_traits::investments::{
 		Investment, InvestmentAccountant, InvestmentProperties, OrderManager, TrancheCurrency,
 	};
 	use cfg_types::orders::{FulfillmentWithPrice, TotalOrder};
@@ -277,6 +277,20 @@ pub mod pallet {
 				.unwrap_or_default()
 				.amount)
 		}
+
+		fn investment_requires_collect(
+			_investor: &T::AccountId,
+			_investment_id: Self::InvestmentId,
+		) -> bool {
+			unimplemented!("not needed here, could also default to false")
+		}
+
+		fn redemption_requires_collect(
+			_investor: &T::AccountId,
+			_investment_id: Self::InvestmentId,
+		) -> bool {
+			unimplemented!("not needed here, could also default to false")
+		}
 	}
 
 	impl<T: Config> OrderManager for Pallet<T>