From daa88a051f6f86499344cd8279d29c8f2924bfe8 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Wed, 4 Jan 2023 23:09:58 -0500 Subject: [PATCH] Remove the timestamp pallet It was needed for contracts, which has since been removed. We now no longer need it. --- Cargo.lock | 2 -- substrate/node/Cargo.toml | 1 - substrate/node/src/command_helper.rs | 12 +++--------- substrate/node/src/service.rs | 4 ++-- substrate/runtime/Cargo.toml | 3 --- substrate/runtime/src/lib.rs | 10 ---------- 6 files changed, 5 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb4880b7..ab8ee761 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7262,7 +7262,6 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-tendermint", - "sp-timestamp", "substrate-build-script-utils", "substrate-frame-rpc-system", "validator-sets-pallet", @@ -7313,7 +7312,6 @@ dependencies = [ "pallet-balances", "pallet-session", "pallet-tendermint", - "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml index f83eb24e..c20ddee2 100644 --- a/substrate/node/Cargo.toml +++ b/substrate/node/Cargo.toml @@ -27,7 +27,6 @@ sp-application-crypto = { git = "https://github.com/serai-dex/substrate" } sp-keystore = { git = "https://github.com/serai-dex/substrate" } sp-keyring = { git = "https://github.com/serai-dex/substrate" } sp-inherents = { git = "https://github.com/serai-dex/substrate" } -sp-timestamp = { git = "https://github.com/serai-dex/substrate" } sp-runtime = { git = "https://github.com/serai-dex/substrate" } sp-blockchain = { git = "https://github.com/serai-dex/substrate" } sp-api = { git = "https://github.com/serai-dex/substrate" } diff --git a/substrate/node/src/command_helper.rs b/substrate/node/src/command_helper.rs index 664a894c..fc649357 100644 --- a/substrate/node/src/command_helper.rs +++ b/substrate/node/src/command_helper.rs @@ -1,8 +1,8 @@ -use std::{sync::Arc, time::Duration}; +use std::sync::Arc; use sp_core::{Encode, Pair}; use sp_keyring::Sr25519Keyring; -use sp_inherents::{InherentData, InherentDataProvider}; +use sp_inherents::InherentData; use sp_runtime::OpaqueExtrinsic; @@ -87,11 +87,5 @@ pub fn create_benchmark_extrinsic( } pub fn inherent_benchmark_data() -> Result { - let mut inherent_data = InherentData::new(); - futures::executor::block_on( - sp_timestamp::InherentDataProvider::new(Duration::from_millis(0).into()) - .provide_inherent_data(&mut inherent_data), - ) - .map_err(|e| format!("creating inherent data: {e:?}"))?; - Ok(inherent_data) + Ok(InherentData::new()) } diff --git a/substrate/node/src/service.rs b/substrate/node/src/service.rs index 6179c0e2..f063641d 100644 --- a/substrate/node/src/service.rs +++ b/substrate/node/src/service.rs @@ -57,13 +57,13 @@ impl NativeExecutionDispatch for ExecutorDispatch { pub struct Cidp; #[async_trait::async_trait] impl CreateInherentDataProviders for Cidp { - type InherentDataProviders = (sp_timestamp::InherentDataProvider,); + type InherentDataProviders = (); async fn create_inherent_data_providers( &self, _: ::Hash, _: (), ) -> Result> { - Ok((sp_timestamp::InherentDataProvider::from_system_time(),)) + Ok(()) } } diff --git a/substrate/runtime/Cargo.toml b/substrate/runtime/Cargo.toml index 7960b012..f964fa7a 100644 --- a/substrate/runtime/Cargo.toml +++ b/substrate/runtime/Cargo.toml @@ -36,7 +36,6 @@ frame-support = { git = "https://github.com/serai-dex/substrate", default-featur frame-executive = { git = "https://github.com/serai-dex/substrate", default-features = false } frame-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true } -pallet-timestamp = { git = "https://github.com/serai-dex/substrate", default-features = false } pallet-balances = { git = "https://github.com/serai-dex/substrate", default-features = false } pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false } @@ -73,7 +72,6 @@ std = [ "frame-support/std", "frame-executive/std", - "pallet-timestamp/std", "pallet-balances/std", "pallet-transaction-payment/std", @@ -94,7 +92,6 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", - "pallet-timestamp/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-tendermint/runtime-benchmarks", diff --git a/substrate/runtime/src/lib.rs b/substrate/runtime/src/lib.rs index 4afc9d47..d4a40c37 100644 --- a/substrate/runtime/src/lib.rs +++ b/substrate/runtime/src/lib.rs @@ -28,7 +28,6 @@ use frame_support::{ }; pub use frame_system::Call as SystemCall; -pub use pallet_timestamp::Call as TimestampCall; pub use pallet_balances::Call as BalancesCall; use pallet_transaction_payment::CurrencyAdapter; @@ -162,13 +161,6 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; } -impl pallet_timestamp::Config for Runtime { - type Moment = u64; - type OnTimestampSet = (); - type MinimumPeriod = ConstU64<{ TARGET_BLOCK_TIME / 2 }>; - type WeightInfo = (); -} - impl pallet_balances::Config for Runtime { type MaxLocks = ConstU32<50>; type MaxReserves = (); @@ -249,7 +241,6 @@ construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic { System: frame_system, - Timestamp: pallet_timestamp, Balances: pallet_balances, TransactionPayment: pallet_transaction_payment, @@ -269,7 +260,6 @@ mod benches { [frame_benchmarking, BaselineBench::] [frame_system, SystemBench::] [pallet_balances, Balances] - [pallet_timestamp, Timestamp] ); }