Merge remote-tracking branch 'origin/master' into fredrik/polkadot_v0…

….9.29
NodleCode · Oct 12, 2022 · 44e38a3 · 44e38a3
2 parents b30bedc + b31de4b
commit 44e38a3
Show file tree

Hide file tree

Showing 14 changed files with 199 additions and 140 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nodle <support@nodle.com>", "Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2021"
 name = "nodle-parachain"
-version = "2.0.22"
+version = "2.0.24"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

diff --git a/pallets/allocations/Cargo.toml b/pallets/allocations/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-allocations"
-version = "2.0.22"
+version = "2.0.24"
 authors = ['Eliott Teissonniere <git.eliott@teissonniere.org>']
 edition = "2021"
 description = "A pallet to handle the Proof Of Connectivity allocations rewards"

diff --git a/pallets/allocations/src/benchmarking.rs b/pallets/allocations/src/benchmarking.rs
@@ -52,7 +52,7 @@ fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
 }
 
 benchmarks! {
-	batch {
+	allocate {
 		let b in 1..T::MaxAllocs::get();
 
 		let batch_arg = make_batch::<T>(b);
@@ -61,24 +61,34 @@ benchmarks! {
 		assert!(members.try_push(oracle.clone()).is_ok());
 		<BenchmarkOracles<T>>::put(&members);
 		<SessionQuota<T>>::put(T::ExistentialDeposit::get() * (b * ALLOC_FACTOR).into());
-	}: _(RawOrigin::Signed(oracle), batch_arg)
+	}:{
+		let _ = Allocations::<T>::allocate(batch_arg);
+	}
 
 	calc_quota {
 	}: {
-		Allocations::<T>::checked_calc_session_quota(Zero::zero(), true);
+		Allocations::<T>::checked_calc_session_quota(Zero::zero());
 	}
 	verify {
-		assert_last_event::<T>(Event::SessionQuotaCalculated(<NextSessionQuota<T>>::get().unwrap()).into())
+		assert_last_event::<T>(Event::SessionQuotaCalculated(<NextSessionQuota<T>>::get()).into())
 	}
 
 	renew_quota {
 	}: {
-		Allocations::<T>::checked_renew_session_quota(Zero::zero(), true);
+		Allocations::<T>::checked_renew_session_quota(Zero::zero());
 	}
 	verify {
 		assert_last_event::<T>(Event::SessionQuotaRenewed.into())
 	}
 
+	checked_update_session_quota {
+	}:{
+		Allocations::<T>::checked_update_session_quota();
+	}
+	verify {
+		assert_eq!(frame_system::Pallet::<T>::events().len(), 2);
+	}
+
 	set_curve_starting_block {
 	}: _(RawOrigin::Root, One::one())
 	verify {