add OracleKey type

libs/mocks/src/data.rs

@@ -50,7 +50,7 @@ pub mod pallet {
 		}
 
 		pub fn mock_feed_value(
-			f: impl Fn(T::DataId, T::DataElem, T::AccountId) -> DispatchResult + 'static,
+			f: impl Fn(T::AccountId, T::DataId, T::DataElem) -> DispatchResult + 'static,
 		) {
 			register_call!(move |(a, b, c)| f(a, b, c));
 		}

libs/primitives/src/lib.rs

@@ -175,9 +175,6 @@ pub mod types {
 
 	/// A representation of a loan identifier
 	pub type LoanId = u64;
-
-	/// A representation of a price identifier
-	pub type PriceId = u64;
 }
 
 /// Common constants for all runtimes

libs/types/src/lib.rs

@@ -24,6 +24,7 @@ pub mod fixed_point;
 pub mod ids;
 pub mod investments;
 pub mod locations;
+pub mod oracles;
 pub mod orders;
 pub mod permissions;
 pub mod time;

libs/types/src/oracles.rs

@@ -0,0 +1,36 @@
+use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::RuntimeDebug;
+use scale_info::TypeInfo;
+#[cfg(feature = "std")]
+use serde::{Deserialize, Serialize};
+
+/// [ISIN](https://en.wikipedia.org/wiki/International_Securities_Identification_Number) format.
+pub type Isin = [u8; 12];
+
+/// A representation of an oracle price identifier
+#[derive(
+	Encode,
+	Decode,
+	Clone,
+	Copy,
+	PartialOrd,
+	Ord,
+	PartialEq,
+	Eq,
+	TypeInfo,
+	RuntimeDebug,
+	MaxEncodedLen,
+)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+pub enum OracleKey {
+	Isin(Isin),
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+impl From<u32> for OracleKey {
+	fn from(value: u32) -> Self {
+		// Any u32 value always fits into 12 bytes
+		let isin = Isin::try_from(&(value as u128).to_be_bytes()[0..12]).unwrap();
+		OracleKey::Isin(isin)
+	}
+}

pallets/loans-ref/src/benchmarking.rs

@@ -252,10 +252,10 @@ where
 	fn max_benchmark_loans() -> u32 {
 		// Maximum loans used for benchmaks.
 		// This can be smaller than `MaxActiveLoansPerPool`,
-		// to avoid calculate weights during hours if this the loan numbers is too
+		// to avoid calculate weights during hours if the loan numbers is too
 		// large. It should be large enough to be able to represent a consistent weight
 		// function for any number of loans.
-		T::MaxActiveLoansPerPool::get().max(50)
+		T::MaxActiveLoansPerPool::get().min(50)
 	}
 }
 

pallets/loans-ref/src/lib.rs

@@ -162,7 +162,6 @@ pub mod pallet {
 		type PriceId: Parameter
 			+ Member
 			+ MaybeSerializeDeserialize
-			+ Default
 			+ TypeInfo
 			+ Copy
 			+ MaxEncodedLen;

runtime/altair/src/lib.rs

@@ -1200,7 +1200,7 @@ impl pallet_loans_ref::Config for Runtime {
 	type NonFungible = Uniques;
 	type Permissions = Permissions;
 	type Pool = PoolSystem;
-	type PriceId = PriceId;
+	type PriceId = u32;
 	type PriceRegistry = pallet_loans_ref::util::NoPriceRegistry<Runtime>;
 	type Rate = Rate;
 	type RuntimeEvent = RuntimeEvent;

runtime/centrifuge/src/lib.rs

@@ -1575,7 +1575,7 @@ impl pallet_loans_ref::Config for Runtime {
 	type NonFungible = Uniques;
 	type Permissions = Permissions;
 	type Pool = PoolSystem;
-	type PriceId = PriceId;
+	type PriceId = u32;
 	type PriceRegistry = pallet_loans_ref::util::NoPriceRegistry<Runtime>;
 	type Rate = Rate;
 	type RuntimeEvent = RuntimeEvent;

runtime/common/src/lib.rs

@@ -255,7 +255,8 @@ pub mod xcm {
 }
 
 pub mod oracle {
-	use cfg_primitives::types::{AccountId, Balance, Moment, PriceId};
+	use cfg_primitives::types::{AccountId, Balance, Moment};
+	use cfg_types::oracles::OracleKey;
 	use orml_traits::{CombineData, DataFeeder, DataProvider, DataProviderExtended};
 	use sp_runtime::DispatchResult;
 	use sp_std::{marker::PhantomData, vec::Vec};
@@ -266,9 +267,9 @@ pub mod oracle {
 	pub struct LastOracleValue;
 
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	impl CombineData<PriceId, OracleValue> for LastOracleValue {
+	impl CombineData<OracleKey, OracleValue> for LastOracleValue {
 		fn combine_data(
-			_: &PriceId,
+			_: &OracleKey,
 			values: Vec<OracleValue>,
 			_: Option<OracleValue>,
 		) -> Option<OracleValue> {
@@ -283,14 +284,14 @@ pub mod oracle {
 	/// and can be removed once they fix this.
 	pub struct DataProviderBridge<OrmlOracle>(PhantomData<OrmlOracle>);
 
-	impl<OrmlOracle: DataProviderExtended<PriceId, OracleValue>>
-		DataProviderExtended<PriceId, (Balance, Moment)> for DataProviderBridge<OrmlOracle>
+	impl<OrmlOracle: DataProviderExtended<OracleKey, OracleValue>>
+		DataProviderExtended<OracleKey, (Balance, Moment)> for DataProviderBridge<OrmlOracle>
 	{
-		fn get_no_op(key: &PriceId) -> Option<(Balance, Moment)> {
+		fn get_no_op(key: &OracleKey) -> Option<(Balance, Moment)> {
 			OrmlOracle::get_no_op(key).map(|OracleValue { value, timestamp }| (value, timestamp))
 		}
 
-		fn get_all_values() -> Vec<(PriceId, Option<(Balance, Moment)>)> {
+		fn get_all_values() -> Vec<(OracleKey, Option<(Balance, Moment)>)> {
 			OrmlOracle::get_all_values()
 				.into_iter()
 				.map(|elem| {
@@ -304,18 +305,18 @@ pub mod oracle {
 		}
 	}
 
-	impl<OrmlOracle: DataProvider<PriceId, Balance>> DataProvider<PriceId, Balance>
+	impl<OrmlOracle: DataProvider<OracleKey, Balance>> DataProvider<OracleKey, Balance>
 		for DataProviderBridge<OrmlOracle>
 	{
-		fn get(key: &PriceId) -> Option<Balance> {
+		fn get(key: &OracleKey) -> Option<Balance> {
 			OrmlOracle::get(key)
 		}
 	}
 
-	impl<OrmlOracle: DataFeeder<PriceId, Balance, AccountId>>
-		DataFeeder<PriceId, Balance, AccountId> for DataProviderBridge<OrmlOracle>
+	impl<OrmlOracle: DataFeeder<OracleKey, Balance, AccountId>>
+		DataFeeder<OracleKey, Balance, AccountId> for DataProviderBridge<OrmlOracle>
 	{
-		fn feed_value(who: AccountId, key: PriceId, value: Balance) -> DispatchResult {
+		fn feed_value(who: AccountId, key: OracleKey, value: Balance) -> DispatchResult {
 			OrmlOracle::feed_value(who, key, value)
 		}
 	}
@@ -330,9 +331,9 @@ pub mod oracle {
 
 		use super::*;
 
-		impl CombineData<PriceId, OracleValue> for LastOracleValue {
+		impl CombineData<OracleKey, OracleValue> for LastOracleValue {
 			fn combine_data(
-				_: &PriceId,
+				_: &OracleKey,
 				_: Vec<OracleValue>,
 				_: Option<OracleValue>,
 			) -> Option<OracleValue> {

runtime/development/src/lib.rs

@@ -34,6 +34,7 @@ use cfg_types::{
 	fixed_point::Rate,
 	ids::PRICE_ORACLE_PALLET_ID,
 	locations::Location,
+	oracles::OracleKey,
 	permissions::{
 		PermissionRoles, PermissionScope, PermissionedCurrencyRole, PoolRole, Role, UNION,
 	},
@@ -1332,7 +1333,7 @@ impl orml_oracle::Config for Runtime {
 	#[cfg(feature = "runtime-benchmarks")]
 	type Members = runtime_common::oracle::benchmarks_util::Members;
 	type OnNewData = PriceCollector;
-	type OracleKey = PriceId;
+	type OracleKey = OracleKey;
 	type OracleValue = Balance;
 	type RootOperatorAccountId = RootOperatorOraclePrice;
 	type RuntimeEvent = RuntimeEvent;
@@ -1343,7 +1344,7 @@ impl orml_oracle::Config for Runtime {
 impl pallet_data_collector::Config for Runtime {
 	type CollectionId = PoolId;
 	type Data = Balance;
-	type DataId = PriceId;
+	type DataId = OracleKey;
 	type DataProvider = runtime_common::oracle::DataProviderBridge<PriceOracle>;
 	type MaxCollectionSize = MaxActiveLoansPerPool;
 	type MaxCollections = MaxPoolsWithExternalPrices;
@@ -1362,7 +1363,7 @@ impl pallet_loans_ref::Config for Runtime {
 	type NonFungible = Uniques;
 	type Permissions = Permissions;
 	type Pool = PoolSystem;
-	type PriceId = PriceId;
+	type PriceId = OracleKey;
 	type PriceRegistry = PriceCollector;
 	type Rate = Rate;
 	type RuntimeEvent = RuntimeEvent;