shared-storage link

reaudito · Nov 28, 2024 · 0377f28 · 0377f28
1 parent fb3b6d9
commit 0377f28
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/custom-pallets/profile-validation/Cargo.toml b/custom-pallets/profile-validation/Cargo.toml
@@ -18,14 +18,15 @@ scale-info = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-std = { workspace = true}
+sp-std = { workspace = true }
 pallet-timestamp = { workspace = true }
-pallet-balances = { workspace = true  }
+pallet-balances = { workspace = true }
 pallet-support = { workspace = true }
 pallet-schelling-game-shared = { workspace = true }
-pallet-sortition-sum-game = { workspace = true}
-trait-schelling-game-shared= { workspace = true }
-
+pallet-sortition-sum-game = { workspace = true }
+trait-schelling-game-shared = { workspace = true }
+pallet-shared-storage = { workspace = true }
+trait-shared-storage = { workspace = true }
 
 
 [dev-dependencies]

diff --git a/custom-pallets/profile-validation/src/lib.rs b/custom-pallets/profile-validation/src/lib.rs
@@ -45,6 +45,7 @@ use pallet_schelling_game_shared::types::{
 use pallet_sortition_sum_game::types::SumTreeName;
 use pallet_support::{new_who_and_when, Content, WhoAndWhenOf};
 use trait_schelling_game_shared::SchellingGameSharedLink;
+use trait_shared_storage::SharedStorageLink;
 pub use types::{CitizenDetailsPost, FIRST_CHALLENGE_POST_ID, FIRST_CITIZEN_ID};
 type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 type BalanceOf<T> = <<T as Config>::Currency as Currency<AccountIdOf<T>>>::Balance;
@@ -92,6 +93,8 @@ pub mod pallet {
 			PhaseData = PhaseData<Self>,
 		>;
 
+		type SharedStorageSource: SharedStorageLink<AccountId = AccountIdOf<Self>>;
+
 		type Currency: ReservableCurrency<Self::AccountId>;
 		/// Handler for the unbalanced increment when rewarding (minting rewards)
 		type Reward: OnUnbalanced<PositiveImbalanceOf<Self>>;

diff --git a/custom-pallets/shared-storage/src/extras.rs b/custom-pallets/shared-storage/src/extras.rs
@@ -6,6 +6,9 @@ use trait_shared_storage::SharedStorageLink;
 impl<T: Config> SharedStorageLink for Pallet<T> {
 	type AccountId = AccountIdOf<T>;
 
+	fn add_approved_citizen_address(new_member: Self::AccountId) -> DispatchResult {
+		Self::add_approved_citizen_address(new_member)
+	}
 	fn check_citizen_is_approved_link(address: Self::AccountId) -> DispatchResult {
 		Self::check_citizen_is_approved(address)
 	}
@@ -41,6 +44,18 @@ impl<T: Config> SharedStorageLink for Pallet<T> {
 }
 
 impl<T: Config> Pallet<T> {
+	pub(super) fn add_approved_citizen_address(new_member: T::AccountId) -> DispatchResult {
+		let mut members = ApprovedCitizenAddress::<T>::get();
+
+		match members.binary_search(&new_member) {
+			Ok(_) => Err(Error::<T>::AlreadyMember.into()),
+			Err(index) => {
+				members.insert(index, new_member.clone());
+				ApprovedCitizenAddress::<T>::put(members);
+				Ok(())
+			},
+		}
+	}
 	pub(super) fn check_citizen_is_approved(address: T::AccountId) -> DispatchResult {
 		let members = ApprovedCitizenAddress::<T>::get();
 

diff --git a/custom-pallets/shared-storage/src/lib.rs b/custom-pallets/shared-storage/src/lib.rs
@@ -20,6 +20,7 @@ use types::ReputationScore;
 
 type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 type Score = i64;
+type DepartmentId = u64;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -41,6 +42,11 @@ pub mod pallet {
 	#[pallet::getter(fn approved_citizen_address)]
 	pub type ApprovedCitizenAddress<T: Config> = StorageValue<_, Vec<T::AccountId>, ValueQuery>; // Its set, add element through binary_search
 
+	#[pallet::storage]
+	#[pallet::getter(fn approved_citizen_address_by_department)]
+	pub type ApprovedCitizenAddressByDepartment<T: Config> =
+		StorageMap<_, Blake2_128Concat, DepartmentId, Vec<T::AccountId>, ValueQuery>;
+
 	#[pallet::storage]
 	#[pallet::getter(fn positive_externality_score)]
 	pub type PositiveExternalityScore<T: Config> =
@@ -89,5 +95,6 @@ pub mod pallet {
 		/// Errors should have helpful documentation associated with them.
 		StorageOverflow,
 		CitizenNotApproved,
+		AlreadyMember,
 	}
 }
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -278,6 +278,7 @@ impl pallet_profile_validation::Config for Runtime {
 	type WeightInfo = pallet_profile_validation::weights::SubstrateWeight<Runtime>;
 	type Currency = Balances;
 	type SchellingGameSharedSource = SchellingGameShared;
+	type SharedStorageSource = SharedStorage;
 	type Slash = ();
 	type Reward = ();
 }

diff --git a/traits/trait-shared-storage/src/lib.rs b/traits/trait-shared-storage/src/lib.rs
@@ -5,6 +5,8 @@ use sp_std::vec::Vec;
 pub trait SharedStorageLink {
 	type AccountId;
 
+	fn add_approved_citizen_address(new_member: Self::AccountId) -> DispatchResult;
+
 	fn check_citizen_is_approved_link(address: Self::AccountId) -> DispatchResult;
 
 	fn get_approved_citizen_count_link() -> u64;