Remove useless CheckWeight. (#1760)

Remove unused imports
PolymeshAssociation · Nov 27, 2024 · 3bbc3eb · 3bbc3eb
1 parent b6c926c
commit 3bbc3eb
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 238 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -189,7 +189,6 @@ polymesh-common-utilities = { path = "pallets/common", default-features = false
 polymesh-runtime-common = { path = "pallets/runtime/common", default-features = false }
 polymesh-primitives = { path = "primitives", default-features = false }
 polymesh-weights = { path = "pallets/weights/", default-features = false }
-polymesh-extensions = { path = "pallets/runtime/extensions", default-features = false }
 
 # RPC
 node-rpc = { path = "rpc" }
@@ -281,7 +280,6 @@ polymesh-contracts = { workspace = true, default-features = false }
 polymesh-common-utilities = { workspace = true, default-features = false }
 polymesh-primitives = { workspace = true, default-features = false }
 polymesh-runtime-common = { workspace = true, default-features = false }
-polymesh-extensions = { workspace = true, default-features = false }
 
 # RPC
 node-rpc = { workspace = true }

diff --git a/pallets/common/src/context.rs b/pallets/common/src/context.rs
@@ -27,7 +27,7 @@ mod test {
     use polymesh_primitives::{AccountId, IdentityId};
 
     use sp_keyring::AccountKeyring;
-    use std::{collections::BTreeMap, convert::From, sync::RwLock, thread};
+    use std::{collections::BTreeMap, convert::From};
 
     struct IdentityTest {}
 

diff --git a/pallets/runtime/common/src/runtime.rs b/pallets/runtime/common/src/runtime.rs
@@ -584,7 +584,7 @@ macro_rules! misc_pallet_impls {
                     frame_system::CheckGenesis::new(),
                     frame_system::CheckEra::from(generic::Era::mortal(period, current_block)),
                     frame_system::CheckNonce::from(nonce),
-                    polymesh_extensions::CheckWeight::new(),
+                    frame_system::CheckWeight::new(),
                     pallet_transaction_payment::ChargeTransactionPayment::from(tip),
                     pallet_permissions::StoreCallMetadata::new(),
                 );
@@ -749,7 +749,7 @@ macro_rules! runtime_apis {
             frame_system::CheckGenesis<Runtime>,
             frame_system::CheckEra<Runtime>,
             frame_system::CheckNonce<Runtime>,
-            polymesh_extensions::CheckWeight<Runtime>,
+            frame_system::CheckWeight<Runtime>,
             pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
             pallet_permissions::StoreCallMetadata<Runtime>,
         );

diff --git a/pallets/runtime/develop/Cargo.toml b/pallets/runtime/develop/Cargo.toml
@@ -13,7 +13,6 @@ polymesh-common-utilities = { path = "../../common", default-features = false }
 polymesh-runtime-common = { path = "../common", default-features = false }
 polymesh-primitives = { path = "../../../primitives", default-features = false }
 polymesh-weights = { path = "../../weights", default-features = false }
-polymesh-extensions = { path = "../extensions", default-features = false }
 
 # Our pallets
 pallet-asset = { path = "../../asset", default-features = false }
@@ -199,7 +198,6 @@ std = [
     "sp-transaction-pool/std",
     "sp-version/std",
     "polymesh-contracts/std",
-    "polymesh-extensions/std",
 ]
 runtime-benchmarks = [
 	"getrandom/js",

diff --git a/pallets/runtime/extensions/Cargo.toml b/pallets/runtime/extensions/Cargo.toml
diff --git a/pallets/runtime/extensions/src/check_weight.rs b/pallets/runtime/extensions/src/check_weight.rs
diff --git a/pallets/runtime/extensions/src/lib.rs b/pallets/runtime/extensions/src/lib.rs
diff --git a/pallets/runtime/mainnet/Cargo.toml b/pallets/runtime/mainnet/Cargo.toml
@@ -10,7 +10,6 @@ build = "build.rs"
 [dependencies]
 # Common
 polymesh-common-utilities = { path = "../../common", default-features = false }
-polymesh-extensions = { path = "../extensions", default-features = false }
 polymesh-primitives = { path = "../../../primitives", default-features = false }
 polymesh-runtime-common = { path = "../common", default-features = false}
 polymesh-weights = { path = "../../weights", default-features = false }

diff --git a/pallets/runtime/testnet/Cargo.toml b/pallets/runtime/testnet/Cargo.toml
@@ -13,7 +13,6 @@ polymesh-common-utilities = { path = "../../common", default-features = false }
 polymesh-runtime-common = { path = "../common", default-features = false}
 polymesh-primitives = { path = "../../../primitives", default-features = false }
 polymesh-weights = { path = "../../weights", default-features = false }
-polymesh-extensions = { path = "../extensions", default-features = false }
 
 # Our pallets
 pallet-asset = { path = "../../asset", default-features = false }

diff --git a/pallets/runtime/tests/Cargo.toml b/pallets/runtime/tests/Cargo.toml
@@ -37,7 +37,6 @@ pallet-treasury = { path = "../../treasury", default-features = false }
 pallet-utility = { path = "../../utility", default-features = false }
 polymesh-common-utilities = { path = "../../common", default-features = false }
 polymesh-contracts = { path = "../../contracts", default-features = false }
-polymesh-extensions = { path = "../extensions", default-features = false }
 polymesh-primitives = { path = "../../../primitives", default-features = false }
 polymesh-runtime-common = { path = "../common", default-features = false, features = ["testing"] }
 polymesh-runtime-develop = { path = "../develop" }

diff --git a/pallets/runtime/tests/src/signed_extra.rs b/pallets/runtime/tests/src/signed_extra.rs
@@ -7,7 +7,9 @@ use polymesh_runtime_develop::{
 };
 
 use frame_support::dispatch::{DispatchClass, DispatchInfo, Weight};
-use frame_system::{CheckEra, CheckGenesis, CheckNonce, CheckSpecVersion, CheckTxVersion};
+use frame_system::{
+    CheckEra, CheckGenesis, CheckNonce, CheckSpecVersion, CheckTxVersion, CheckWeight,
+};
 use sp_io::TestExternalities;
 use sp_runtime::{generic, traits::SignedExtension};
 use sp_std::convert::From;
@@ -33,7 +35,7 @@ fn make_signed_extra(current_block: u64, period: u64, nonce: Index, tip: u128) -
         CheckGenesis::<Runtime>::new(),
         CheckEra::<Runtime>::from(generic::Era::mortal(period, current_block)),
         CheckNonce::<Runtime>::from(nonce),
-        polymesh_extensions::CheckWeight::<Runtime>::new(),
+        CheckWeight::<Runtime>::new(),
         pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
         pallet_permissions::StoreCallMetadata::<Runtime>::new(),
     )

diff --git a/pallets/runtime/tests/src/storage.rs b/pallets/runtime/tests/src/storage.rs
@@ -1053,7 +1053,7 @@ fn signed_extra(nonce: Index) -> SignedExtra {
         frame_system::CheckGenesis::new(),
         frame_system::CheckEra::from(Era::mortal(256, 0)),
         frame_system::CheckNonce::from(nonce),
-        polymesh_extensions::CheckWeight::new(),
+        frame_system::CheckWeight::new(),
         pallet_transaction_payment::ChargeTransactionPayment::from(0),
         pallet_permissions::StoreCallMetadata::new(),
     )

diff --git a/src/benchmarking.rs b/src/benchmarking.rs
@@ -135,7 +135,7 @@ pub fn create_benchmark_extrinsic<R, D: NativeExecutionDispatch + 'static>(
             best_block.saturated_into(),
         )),
         frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
-        polymesh_extensions::CheckWeight::new(),
+        frame_system::CheckWeight::new(),
         pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
         pallet_permissions::StoreCallMetadata::new(),
     );