remove unused imports for tests; update deprecated methods for tests

Cerebellum-Network · Aug 30, 2023 · 329f55c · 329f55c
1 parent 039c83f
commit 329f55c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/pallets/chainbridge/src/mock.rs b/pallets/chainbridge/src/mock.rs
@@ -3,13 +3,13 @@
 use super::*;
 
 use frame_support::{
-	assert_ok, ord_parameter_types, parameter_types, traits::Everything, weights::Weight, PalletId,
+	assert_ok, ord_parameter_types, parameter_types, traits::Everything, weights::Weight,
 };
 use frame_system::{self as system};
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
-	traits::{AccountIdConversion, BlakeTwo256, Block as BlockT, IdentityLookup},
+	traits::{AccountIdConversion, BlakeTwo256, IdentityLookup},
 	Perbill,
 };
 
@@ -146,7 +146,7 @@ pub fn new_test_ext_initialized(
 // include the most recent event, but do not have to include every past event.
 pub fn assert_events(mut expected: Vec<RuntimeEvent>) {
 	let mut actual: Vec<RuntimeEvent> =
-		system::Module::<Test>::events().iter().map(|e| e.event.clone()).collect();
+		system::Pallet::<Test>::events().iter().map(|e| e.event.clone()).collect();
 
 	expected.reverse();
 

diff --git a/pallets/chainbridge/src/tests.rs b/pallets/chainbridge/src/tests.rs
@@ -10,7 +10,6 @@ use super::{
 };
 use crate::mock::new_test_ext_initialized;
 use frame_support::{assert_noop, assert_ok};
-use frame_system::Origin;
 
 #[test]
 fn derive_ids() {

diff --git a/pallets/ddc-metrics-offchain-worker/src/tests/mod.rs b/pallets/ddc-metrics-offchain-worker/src/tests/mod.rs
@@ -1,6 +1,5 @@
 use frame_support::traits::{Currency, OffchainWorker};
 use frame_system::Config as FSC;
-use pallet_contracts::{self as contracts, Config as CC};
 use sp_core::offchain::{
 	testing, OffchainDbExt, OffchainWorkerExt, Timestamp as OCWTimestamp, TransactionPoolExt,
 };
@@ -285,7 +284,7 @@ fn should_run_contract() {
 		let contract_id = deploy_contract();
 		let call_data = DdcMetricsOffchainWorker::encode_get_current_period_ms();
 
-		pallet_contracts::Module::<T>::call(
+		pallet_contracts::Pallet::<T>::call(
 			RuntimeOrigin::signed(alice.clone()),
 			contract_id.clone(),
 			0,

diff --git a/pallets/ddc-metrics-offchain-worker/src/tests/test_runtime.rs b/pallets/ddc-metrics-offchain-worker/src/tests/test_runtime.rs
@@ -4,7 +4,6 @@
 
 use crate::{self as pallet_ddc_metrics_offchain_worker, *};
 
-use codec::{Decode, Encode};
 use frame_support::{
 	parameter_types,
 	traits::{ConstU32, Currency, Everything, Get, Nothing},
@@ -30,8 +29,6 @@ pub type Moment = u64;
 // -- Implement a contracts runtime for testing --
 
 // Macro hack: Give names to the pallets.
-use frame_system as system;
-use pallet_balances as balances;
 use pallet_contracts as contracts;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;

diff --git a/pallets/ddc/src/mock.rs b/pallets/ddc/src/mock.rs
@@ -1,5 +1,4 @@
 use crate as pallet_cere_ddc;
-use crate::Module;
 use frame_support::{construct_runtime, parameter_types, traits::Everything};
 use frame_system as system;
 use sp_core::H256;

diff --git a/pallets/erc721/src/mock.rs b/pallets/erc721/src/mock.rs
@@ -5,7 +5,7 @@ use frame_system::{self as system};
 use sp_core::{hashing::blake2_128, H256};
 use sp_runtime::{
 	testing::Header,
-	traits::{BlakeTwo256, Block as BlockT, IdentityLookup},
+	traits::{BlakeTwo256, IdentityLookup},
 	BuildStorage, Perbill,
 };
 

diff --git a/runtime/cere-dev/src/impls.rs b/runtime/cere-dev/src/impls.rs
@@ -36,7 +36,10 @@ mod multiplier_tests {
 		System, TargetBlockFullness, TransactionPayment,
 	};
 	use cere_dev_runtime_constants::{currency::*, time::*};
-	use frame_support::weights::{DispatchClass, Weight, WeightToFee as WeightToFeeT};
+	use frame_support::{
+		dispatch::DispatchClass,
+		weights::{Weight, WeightToFee as WeightToFeeT},
+	};
 	use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 	use sp_runtime::{
 		assert_eq_error_rate,

diff --git a/runtime/cere/src/impls.rs b/runtime/cere/src/impls.rs
@@ -36,7 +36,10 @@ mod multiplier_tests {
 		System, TargetBlockFullness, TransactionPayment,
 	};
 	use cere_runtime_constants::{currency::*, time::*};
-	use frame_support::weights::{DispatchClass, Weight, WeightToFee as WeightToFeeT};
+	use frame_support::{
+		dispatch::DispatchClass,
+		weights::{Weight, WeightToFee as WeightToFeeT},
+	};
 	use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 	use sp_runtime::{
 		assert_eq_error_rate,