adds marketplace type aliases

Author: amatsonkali

pallets/gated-marketplace/src/functions.rs

@@ -447,7 +447,7 @@ impl<T: Config> Pallet<T> {
 
     pub fn set_up_application(
         fields : Fields<T>,
-        custodian_fields: Option<(T::AccountId, BoundedVec<BoundedVec<u8,ConstU32<100>>, T::MaxFiles> )> 
+        custodian_fields: Option<CustodianFields<T>> 
     )-> (Option<T::AccountId>, BoundedVec<ApplicationField, T::MaxFiles> ){
         let mut f: Vec<ApplicationField>= fields.iter().map(|tuple|{
             ApplicationField{

pallets/gated-marketplace/src/lib.rs

@@ -336,7 +336,7 @@ pub mod pallet {
 			marketplace_id: [u8;32],
 			// Getting encoding errors from polkadotjs if an object vector have optional fields
 			fields : Fields<T>,
-			custodian_fields: Option<(T::AccountId, BoundedVec<BoundedVec<u8,ConstU32<100>>, T::MaxFiles> )> 
+			custodian_fields: Option<CustodianFields<T>> 
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 
@@ -374,7 +374,7 @@ pub mod pallet {
 			marketplace_id: [u8;32],
 			// Getting encoding errors from polkadotjs if an object vector have optional fields
 			fields : Fields<T>,
-			custodian_fields: Option<(T::AccountId, BoundedVec<BoundedVec<u8,ConstU32<100>>, T::MaxFiles> )> 
+			custodian_fields: Option<CustodianFields<T>> 
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 

pallets/gated-marketplace/src/types.rs

@@ -5,10 +5,12 @@ use frame_support::pallet_prelude::*;
 use sp_runtime::sp_std::vec::Vec;
 use frame_support::sp_io::hashing::blake2_256;
 
-pub type Fields<T> = BoundedVec<(BoundedVec<u8,ConstU32<100> >,BoundedVec<u8,ConstU32<100>> ), <T as Config>::MaxFiles>;
-
-//Todo: fix AccountId import
-//pub type CustodianFields<T> = Option<(RawOrigin<T>, BoundedVec<BoundedVec<u8,ConstU32<100>>, <T as Config>::MaxFiles>)>;
+pub type Fields<T> = BoundedVec<(FieldName,Cid), <T as Config>::MaxFiles>;
+type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
+pub type FieldName = BoundedVec<u8,ConstU32<100>>;
+pub type Cid = BoundedVec<u8,ConstU32<100>>;
+pub type Cids<Len> = BoundedVec<Cid, Len>;
+pub type CustodianFields<T> = ( AccountIdOf<T>, Cids<<T as Config>::MaxFiles>);
 
 #[derive(CloneNoBound,Encode, Decode, RuntimeDebugNoBound, Default, TypeInfo, MaxEncodedLen,)]
 #[scale_info(skip_type_params(T))]
@@ -148,8 +150,8 @@ impl Default for ApplicationStatus{
 #[derive(CloneNoBound, Encode ,Decode, Eq, RuntimeDebugNoBound, Default, TypeInfo, MaxEncodedLen)]
 pub struct ApplicationField{
     pub display_name: BoundedVec<u8,ConstU32<100> >,
-    pub cid: BoundedVec<u8, ConstU32<100> >,
-    pub custodian_cid: Option<BoundedVec<u8, ConstU32<100> > >,
+    pub cid: Cid,
+    pub custodian_cid: Option<Cid>,
 }
 // Eq macro didnt work (binary operation `==` cannot be applied to type...)
 impl PartialEq for ApplicationField{