Merge remote-tracking branch 'origin/master' into gui-origin-filter

frame/system/src/lib.rs

@@ -1895,7 +1895,7 @@ pub(crate) mod tests {
 	use sp_runtime::{traits::{BlakeTwo256, IdentityLookup, SignedExtension}, testing::Header, DispatchError};
 	use frame_support::{
 		impl_outer_origin, parameter_types, assert_ok, assert_noop,
-		weights::WithPostDispatchInfo,
+		weights::{WithPostDispatchInfo, Pays},
 	};
 
 	impl_outer_origin! {

frame/utility/src/lib.rs

@@ -54,10 +54,10 @@ use sp_std::prelude::*;
 use codec::{Encode, Decode};
 use sp_core::TypeId;
 use sp_io::hashing::blake2_256;
-use frame_support::{decl_module, decl_event, decl_storage, Parameter};
+use frame_support::{decl_module, decl_event, decl_error, decl_storage, Parameter, ensure};
 use frame_support::{
 	traits::{OriginTrait, UnfilteredDispatchable},
-	weights::{Weight, GetDispatchInfo, DispatchClass, FunctionOf, Pays}, dispatch::PostDispatchInfo,
+	weights::{Weight, GetDispatchInfo, DispatchClass}, dispatch::PostDispatchInfo,
 };
 use frame_system::{self as system, ensure_signed, ensure_root};
 use sp_runtime::{DispatchError, DispatchResult, traits::Dispatchable};