Merge remote-tracking branch 'origin/master' into gav-xcm-v3

pallets/dmp-queue/src/lib.rs

@@ -307,7 +307,7 @@ pub mod pallet {
 									id, remaining, required,
 								));
 							}
-						}
+						},
 					}
 				}
 				// Cannot be an `else` here since the `maybe_enqueue_page` may have changed.
@@ -371,6 +371,7 @@ mod tests {
 			impl_version: 1,
 			apis: sp_version::create_apis_vec!([]),
 			transaction_version: 1,
+			state_version: 1,
 		};
 		pub const ParachainId: ParaId = ParaId::new(200);
 		pub const ReservedXcmpWeight: Weight = 0;
@@ -403,6 +404,7 @@ mod tests {
 		type SystemWeightInfo = ();
 		type SS58Prefix = ();
 		type OnSetCode = ();
+		type MaxConsumers = frame_support::traits::ConstU32<16>;
 	}
 
 	thread_local! {
@@ -475,7 +477,7 @@ mod tests {
 		Xcm(vec![Transact {
 			origin_kind: OriginKind::Native,
 			require_weight_at_most: weight,
-			call: vec![].into(),
+			call: Vec::new().into(),
 		}])
 	}
 
@@ -506,7 +508,7 @@ mod tests {
 		new_test_ext().execute_with(|| {
 			let weight_used = handle_messages(&[], 1000);
 			assert_eq!(weight_used, 0);
-			assert_eq!(take_trace(), vec![]);
+			assert_eq!(take_trace(), Vec::new());
 			assert!(queue_is_empty());
 		});
 	}