Remove changes to test env

frame/identity/src/benchmarking.rs

@@ -93,12 +93,10 @@ impl Trait for Benchmark {
 }
 type System = frame_system::Module<Benchmark>;
 type Balances = pallet_balances::Module<Benchmark>;
-pub type Identity = Module<Benchmark>;
+type Identity = Module<Benchmark>;
 
-pub type BalancesCall = pallet_balances::Call<Benchmark>;
 pub type IdentityCall = crate::Call<Benchmark>;
 
-
 pub mod set_identity {
 	use super::*;
 
@@ -118,7 +116,7 @@ pub mod set_identity {
 	///
 	/// Sets up state randomly and returns a randomly generated `set_identity` with sensible (fixed)
 	/// values for all complexity components except those mentioned in the identity.
-	pub fn instance(components: &[(&'static str, u32)]) -> Call<Benchmark>
+	pub fn instance(components: &[(&'static str, u32)]) -> Call
 	{
 		// Add r registrars
 		let r = components.iter().find(|&c| c.0 == "R").unwrap();
@@ -131,9 +129,10 @@ pub mod set_identity {
 
 		// Create identity info with x additional fields
 		let x = components.iter().find(|&c| c.0 == "R").unwrap();
-		let data = Data::Raw(vec![0; x.1 as usize]);
+		// 32 byte data that we reuse below
+		let data = Data::Raw(vec![0; 32]);
 		let info = IdentityInfo {
-			additional: vec![(data.clone(), data.clone()); 3],
+			additional: vec![(data.clone(), data.clone()); x.1 as usize],
 			display: data.clone(),
 			legal: data.clone(),
 			web: data.clone(),

frame/identity/src/lib.rs

@@ -902,13 +902,13 @@ impl<T: Trait> Benchmarking for Module<T> {
 }
 
 #[cfg(test)]
-pub mod tests {
+mod tests {
 	use super::*;
 
 	use sp_runtime::traits::BadOrigin;
 	use frame_support::{
 		assert_ok, assert_noop, impl_outer_origin, parameter_types, weights::Weight,
-		ord_parameter_types, impl_outer_dispatch,
+		ord_parameter_types,
 	};
 	use sp_core::H256;
 	use frame_system::EnsureSignedBy;
@@ -922,14 +922,6 @@ pub mod tests {
 		pub enum Origin for Test  where system = frame_system {}
 	}
 
-	impl_outer_dispatch! {
-		pub enum Call for Test where origin: Origin {
-			frame_system::System,
-			pallet_balances::Balances,
-			pallet_identity::Identity,
-		}
-	}
-
 	// For testing the module, we construct most of a mock runtime. This means
 	// first constructing a configuration type (`Test`) which `impl`s each of the
 	// configuration traits of modules we want to use.
@@ -946,7 +938,7 @@ pub mod tests {
 		type Index = u64;
 		type BlockNumber = u64;
 		type Hash = H256;
-		type Call = Call;
+		type Call = ();
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;
 		type Lookup = IdentityLookup<Self::AccountId>;
@@ -999,7 +991,7 @@ pub mod tests {
 	}
 	type System = frame_system::Module<Test>;
 	type Balances = pallet_balances::Module<Test>;
-	pub type Identity = Module<Test>;
+	type Identity = Module<Test>;
 
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mockup.