Benchmark macro: Allow multiple bounds in where (paritytech#8116)

ParthDesai · Feb 18, 2021 · 75a2d29 · 75a2d29
1 parent cd11670
commit 75a2d29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/frame/benchmarking/src/lib.rs b/frame/benchmarking/src/lib.rs
@@ -199,12 +199,12 @@ macro_rules! benchmarks_iter {
 		{ $( $where_clause:tt )* }
 		( $( $names:tt )* )
 		( $( $names_extra:tt )* )
-		where_clause { where $( $where_ty:ty: $where_bound:path ),* $(,)? }
+		where_clause { where $( $where_bound:tt )* }
 		$( $rest:tt )*
 	) => {
 		$crate::benchmarks_iter! {
 			{ $( $instance)? }
-			{ $( $where_ty: $where_bound ),* }
+			{ $( $where_bound )* }
 			( $( $names )* )
 			( $( $names_extra )* )
 			$( $rest )*

diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs
@@ -138,7 +138,8 @@ mod benchmarks {
 	crate::benchmarks!{
 		where_clause {
 			where
-				<T as pallet_test::OtherConfig>::OtherEvent: Into<<T as pallet_test::Config>::Event>
+				<T as pallet_test::OtherConfig>::OtherEvent: Into<<T as pallet_test::Config>::Event> + Clone,
+				<T as pallet_test::Config>::Event: Clone,
 		}
 
 		set_value {