Merge pull request #242 from jurteam/develop

develop to staging

Author: Polkaverse

pallets/bounties/src/benchmarking.rs

@@ -157,7 +157,7 @@ benchmarks! {
 		2
 	)
 	verify {
-		assert_last_event::<T>(Event::<T>::CreatedBounty(<T as pallet::Config>::Helper::bounty(1)).into());
+		assert_last_event::<T>(Event::<T>::CreatedBounty(community_id, <T as pallet::Config>::Helper::bounty(1)).into());
 	}
 
 	update_bounty {
@@ -204,7 +204,7 @@ benchmarks! {
 		bounded_accounts
 	)
 	verify {
-		assert_last_event::<T>(Event::<T>::UpdatedBounty(<T as pallet::Config>::Helper::bounty(1)).into());
+		assert_last_event::<T>(Event::<T>::UpdatedBounty(community_id, <T as pallet::Config>::Helper::bounty(1)).into());
 	}
 
 	complete_bounty {
@@ -258,7 +258,7 @@ benchmarks! {
 		members
 	)
 	verify {
-		assert_last_event::<T>(Event::<T>::CompletedBounty(<T as pallet::Config>::Helper::bounty(1)).into());
+		assert_last_event::<T>(Event::<T>::CompletedBounty(community_id, <T as pallet::Config>::Helper::bounty(1)).into());
 	}
 
 	impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);

pallets/bounties/src/lib.rs

@@ -128,16 +128,14 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		/// Created Bounty [Bounty Id]
-		CreatedBounty(T::BountyId),
-		/// Updated Bounty [Bounty Id]
-		UpdatedBounty(T::BountyId),
-		/// Added bounty contributor to the chain [Bounty Id]
-		AddedContributor(T::BountyId),
-		/// Completed bounty and badges assigned to the contributors [Bounty Id]
-		CompletedBounty(T::BountyId),
-		/// Bounty closed due to deadline meet.
-		ClosedBounty(T::BountyId),
+		/// Created Bounty [Community Id, Bounty Id]
+		CreatedBounty(T::CommunityId, T::BountyId),
+		/// Updated Bounty [Community Id, Bounty Id]
+		UpdatedBounty(T::CommunityId, T::BountyId),
+		/// Completed bounty and badges assigned to the contributors [Community Id, Bounty Id]
+		CompletedBounty(T::CommunityId, T::BountyId),
+		/// Bounty closed due to deadline meet [Community Id, Bounty Id]
+		ClosedBounty(T::CommunityId, T::BountyId),
 	}
 
 	#[pallet::error]
@@ -186,7 +184,7 @@ pub mod pallet {
 
 						bounty.status = BountyStatus::Completed;
 
-						Self::deposit_event(Event::ClosedBounty(bounty_id));
+						Self::deposit_event(Event::ClosedBounty(community_id, bounty_id));
 
 						Ok(())
 					},
@@ -294,7 +292,7 @@ pub mod pallet {
 				bounty.participants = participants;
 				bounty.status = BountyStatus::WorkInProgress;
 
-				Self::deposit_event(Event::UpdatedBounty(bounty_id));
+				Self::deposit_event(Event::UpdatedBounty(community_id, bounty_id));
 				Ok(())
 			})
 		}
@@ -376,7 +374,7 @@ pub mod pallet {
 				}
 				bounty.contributors = bounty_contributors;
 
-				Self::deposit_event(Event::CompletedBounty(bounty_id));
+				Self::deposit_event(Event::CompletedBounty(community_id, bounty_id));
 				Ok(())
 			})
 		}
@@ -427,7 +425,7 @@ impl<T: Config> Pallet<T> {
 		let next_id = bounty_id.increment();
 		NextBountyId::<T>::insert(community_id, next_id);
 
-		Self::deposit_event(Event::CreatedBounty(bounty_id));
+		Self::deposit_event(Event::CreatedBounty(community_id, bounty_id));
 
 		Ok(().into())
 	}

runtime/src/lib.rs

@@ -122,7 +122,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	//   `spec_version`, and `authoring_version` are the same between Wasm and native.
 	// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
 	//   the compatible custom types.
-	spec_version: 125,
+	spec_version: 126,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,