Consume the rest of the block and add test verification after the ben…

…chmark

frame/system/benchmarking/src/lib.rs

@@ -52,14 +52,7 @@ benchmarks! {
  let runtime_blob = include_bytes!("../res/kitchensink_runtime.compact.compressed.wasm");
  }: _(RawOrigin::Root, runtime_blob.to_vec())
  verify {
- assert_eq!(
- System::<T>::events(),
- vec![EventRecord {
- phase: Phase::Initialization,
- event: frame_system::Event::<T>::CodeUpdated.into(),
- topics: vec![],
- }],
- );
+ System::<T>::assert_last_event(frame_system::Event::<T>::CodeUpdated.into());
  }
 
  #[extra]

frame/system/src/lib.rs

@@ -412,7 +412,8 @@ pub mod pallet {
  ensure_root(origin)?;
  Self::can_set_code(&code)?;
  T::OnSetCode::set_code(code)?;
- Ok(().into())
+ // consume the rest of the block to prevent further transactions
+ Ok(Some(T::BlockWeights::get().max_block).into())
  }
 
  /// Set the new runtime code without doing any checks of the given `code`.