Governance 2 (Part 1, Non-Controversial Changes) (#5892)

* initial stuff

* make copy data from kusama

* Update runtime/kusama/src/governance/old.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update runtime/kusama/src/governance/mod.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

polkadot/xcm/pallet-xcm/src/lib.rs

@@ -1517,8 +1517,8 @@ where
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	fn successful_origin() -> O {
-		O::from(Origin::Xcm(Here.into()))
+	fn try_successful_origin() -> Result<O, ()> {
+		Ok(O::from(Origin::Xcm(Here.into())))
 	}
 }
 
@@ -1542,8 +1542,8 @@ where
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	fn successful_origin() -> O {
-		O::from(Origin::Response(Here.into()))
+	fn try_successful_origin() -> Result<O, ()> {
+		Ok(O::from(Origin::Response(Here.into())))
 	}
 }
 

polkadot/xcm/xcm-builder/src/origin_conversion.rs

@@ -253,8 +253,8 @@ where
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	fn successful_origin() -> Origin {
-		Origin::root()
+	fn try_successful_origin() -> Result<Origin, ()> {
+		Ok(Origin::root())
 	}
 }
 

polkadot/xcm/xcm-executor/src/traits/weight.rs

@@ -47,9 +47,9 @@ pub trait WeightTrader: Sized {
 	/// Create a new trader instance.
 	fn new() -> Self;
 
-	/// Purchase execution weight credit in return for up to a given `fee`. If less of the fee is required
-	/// then the surplus is returned. If the `fee` cannot be used to pay for the `weight`, then an error is
-	/// returned.
+	/// Purchase execution weight credit in return for up to a given `payment`. If less of the
+	/// payment is required then the surplus is returned. If the `payment` cannot be used to pay
+	/// for the `weight`, then an error is returned.
 	fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result<Assets, XcmError>;
 
 	/// Attempt a refund of `weight` into some asset. The caller does not guarantee that the weight was