From ef144b1a88c6478e5d6dac945ffe12053f05d96a Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Fri, 24 May 2024 12:01:10 +0200
Subject: [PATCH] Attempt to avoid specifying `BlockHashCount` for different
`mocking::{MockBlock, MockBlockU32, MockBlockU128}` (#4543)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
While doing some migration/rebase I came in to the situation, where I
needed to change `mocking::MockBlock` to `mocking::MockBlockU32`:
```
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for TestRuntime {
type Block = frame_system::mocking::MockBlockU32<TestRuntime>;
type AccountData = pallet_balances::AccountData<ThisChainBalance>;
}
```
But actual `TestDefaultConfig` for `frame_system` is using `ConstU64`
for `type BlockHashCount = frame_support::traits::ConstU64<10>;`
[here](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/frame/system/src/lib.rs#L303).
Because of this, it force me to specify and add override for `type
BlockHashCount = ConstU32<10>`.
This PR tries to fix this with `TestBlockHashCount` implementation for
`TestDefaultConfig` which supports `u32`, `u64` and `u128` as a
`BlockNumber`.
### How to simulate error
Just by removing `type BlockHashCount = ConstU32<250>;`
[here](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/frame/multisig/src/tests.rs#L44)
```
:~/parity/olkadot-sdk$ cargo test -p pallet-multisig
Compiling pallet-multisig v28.0.0 (/home/bparity/parity/aaa/polkadot-sdk/substrate/frame/multisig)
error[E0277]: the trait bound `ConstU64<10>: frame_support::traits::Get<u32>` is not satisfied
--> substrate/frame/multisig/src/tests.rs:41:1
|
41 | #[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `frame_support::traits::Get<u32>` is not implemented for `ConstU64<10>`
|
= help: the following other types implement trait `frame_support::traits::Get<T>`:
<ConstU64<T> as frame_support::traits::Get<u64>>
<ConstU64<T> as frame_support::traits::Get<std::option::Option<u64>>>
note: required by a bound in `frame_system::Config::BlockHashCount`
--> /home/bparity/parity/aaa/polkadot-sdk/substrate/frame/system/src/lib.rs:535:24
|
535 | type BlockHashCount: Get<BlockNumberFor<Self>>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Config::BlockHashCount`
= note: this error originates in the attribute macro `derive_impl` which comes from the expansion of the macro `frame_support::macro_magic::forward_tokens_verbatim` (in Nightly builds, run with -Z macro-backtrace for more info)
For more information about this error, try `rustc --explain E0277`.
error: could not compile `pallet-multisig` (lib test) due to 1 previous error
```
## For reviewers:
(If there is a better solution, please let me know!)
The first commit contains actual attempt to fix the problem:
https://github.com/paritytech/polkadot-sdk/commit/3c5499e539f2218503fbd6ce9be085b03c31ee13.
The second commit is just removal of `BlockHashCount` from all other
places where not needed by default.
Closes: https://github.com/paritytech/polkadot-sdk/issues/1657
---------
Co-authored-by: Bastian Köcher <git@kchr.de>
---
bridges/bin/runtime-common/src/mock.rs | 1 -
.../pallets/inbound-queue/src/mock.rs | 5 -----
.../pallets/outbound-queue/src/mock.rs | 5 -----
bridges/snowbridge/pallets/system/src/mock.rs | 3 +--
cumulus/pallets/collator-selection/src/mock.rs | 2 --
cumulus/pallets/parachain-system/src/mock.rs | 2 --
cumulus/pallets/xcmp-queue/src/mock.rs | 2 --
cumulus/parachains/common/src/impls.rs | 2 --
.../pallets/collective-content/src/mock.rs | 5 +----
.../runtime/common/src/assigned_slots/mod.rs | 5 -----
polkadot/runtime/common/src/auctions.rs | 5 -----
polkadot/runtime/common/src/crowdloan/mod.rs | 5 -----
polkadot/runtime/common/src/impls.rs | 2 --
.../runtime/common/src/integration_tests.rs | 2 --
.../runtime/common/src/paras_registrar/mod.rs | 2 --
polkadot/runtime/common/src/purchase.rs | 5 -----
polkadot/runtime/common/src/slots/mod.rs | 5 -----
polkadot/runtime/parachains/src/mock.rs | 2 --
polkadot/xcm/pallet-xcm/src/mock.rs | 5 -----
polkadot/xcm/xcm-builder/src/tests/pay/mock.rs | 1 -
polkadot/xcm/xcm-builder/tests/mock/mod.rs | 5 -----
substrate/frame/alliance/src/mock.rs | 1 -
.../contracts/mock-network/src/parachain.rs | 5 -----
.../contracts/mock-network/src/relay_chain.rs | 5 -----
.../test-staking-e2e/src/mock.rs | 1 -
substrate/frame/examples/basic/src/tests.rs | 1 -
substrate/frame/examples/dev-mode/src/tests.rs | 1 -
.../examples/offchain-worker/src/tests.rs | 1 -
substrate/frame/im-online/src/mock.rs | 1 -
substrate/frame/indices/src/mock.rs | 1 -
substrate/frame/multisig/src/tests.rs | 1 -
substrate/frame/offences/src/mock.rs | 3 +--
substrate/frame/paged-list/src/mock.rs | 6 +-----
substrate/frame/safe-mode/src/mock.rs | 1 -
.../frame/state-trie-migration/src/lib.rs | 7 +------
.../frame/support/test/tests/final_keys.rs | 3 +--
.../frame/support/test/tests/genesisconfig.rs | 3 +--
substrate/frame/support/test/tests/instance.rs | 1 -
.../frame/support/test/tests/issue2219.rs | 1 -
substrate/frame/support/test/tests/origin.rs | 2 --
substrate/frame/support/test/tests/pallet.rs | 1 -
.../support/test/tests/pallet_instance.rs | 1 -
.../test/tests/pallet_outer_enums_explicit.rs | 3 +--
.../test/tests/pallet_outer_enums_implicit.rs | 3 +--
.../tests/pallet_ui/pass/dev_mode_valid.rs | 1 -
substrate/frame/support/test/tests/runtime.rs | 3 +--
.../test/tests/runtime_legacy_ordering.rs | 3 +--
.../support/test/tests/runtime_metadata.rs | 1 -
.../frame/support/test/tests/storage_layers.rs | 1 -
.../support/test/tests/storage_transaction.rs | 3 +--
.../support/test/tests/versioned_migration.rs | 2 --
substrate/frame/system/benches/bench.rs | 6 +-----
substrate/frame/system/src/lib.rs | 18 +++++++++++++++---
.../asset-conversion-tx-payment/src/mock.rs | 1 -
.../asset-tx-payment/src/mock.rs | 1 -
.../frame/transaction-payment/src/mock.rs | 1 -
.../frame/transaction-storage/src/mock.rs | 3 +--
substrate/frame/tx-pause/src/mock.rs | 4 ----
.../parachain/pallets/template/src/mock.rs | 2 --
.../solochain/pallets/template/src/mock.rs | 6 +-----
60 files changed, 30 insertions(+), 150 deletions(-)
diff --git a/bridges/bin/runtime-common/src/mock.rs b/bridges/bin/runtime-common/src/mock.rs
index e323f1edfc7..f4947466789 100644
--- a/bridges/bin/runtime-common/src/mock.rs
+++ b/bridges/bin/runtime-common/src/mock.rs
@@ -148,7 +148,6 @@ impl frame_system::Config for TestRuntime {
type AccountId = ThisChainAccountId;
type Block = ThisChainBlock;
type AccountData = pallet_balances::AccountData<ThisChainBalance>;
- type BlockHashCount = ConstU32<250>;
}
impl pallet_utility::Config for TestRuntime {
diff --git a/bridges/snowbridge/pallets/inbound-queue/src/mock.rs b/bridges/snowbridge/pallets/inbound-queue/src/mock.rs
index c96c868bc26..05481ca2f6b 100644
--- a/bridges/snowbridge/pallets/inbound-queue/src/mock.rs
+++ b/bridges/snowbridge/pallets/inbound-queue/src/mock.rs
@@ -43,10 +43,6 @@ frame_support::construct_runtime!(
pub type Signature = MultiSignature;
pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
-}
-
type Balance = u128;
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
@@ -60,7 +56,6 @@ impl frame_system::Config for Test {
type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u128>;
type Nonce = u64;
diff --git a/bridges/snowbridge/pallets/outbound-queue/src/mock.rs b/bridges/snowbridge/pallets/outbound-queue/src/mock.rs
index 5eeeeead140..d65a96e2702 100644
--- a/bridges/snowbridge/pallets/outbound-queue/src/mock.rs
+++ b/bridges/snowbridge/pallets/outbound-queue/src/mock.rs
@@ -33,10 +33,6 @@ frame_support::construct_runtime!(
}
);
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
-}
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type BaseCallFilter = Everything;
@@ -48,7 +44,6 @@ impl frame_system::Config for Test {
type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type PalletInfo = PalletInfo;
type Nonce = u64;
type Block = Block;
diff --git a/bridges/snowbridge/pallets/system/src/mock.rs b/bridges/snowbridge/pallets/system/src/mock.rs
index 687072a49e2..d7fc4152b37 100644
--- a/bridges/snowbridge/pallets/system/src/mock.rs
+++ b/bridges/snowbridge/pallets/system/src/mock.rs
@@ -3,7 +3,7 @@
use crate as snowbridge_system;
use frame_support::{
derive_impl, parameter_types,
- traits::{tokens::fungible::Mutate, ConstU128, ConstU64, ConstU8},
+ traits::{tokens::fungible::Mutate, ConstU128, ConstU8},
weights::IdentityFee,
PalletId,
};
@@ -106,7 +106,6 @@ impl frame_system::Config for Test {
type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u128>;
type Nonce = u64;
diff --git a/cumulus/pallets/collator-selection/src/mock.rs b/cumulus/pallets/collator-selection/src/mock.rs
index 4a440dfe1e9..196184d6278 100644
--- a/cumulus/pallets/collator-selection/src/mock.rs
+++ b/cumulus/pallets/collator-selection/src/mock.rs
@@ -46,7 +46,6 @@ frame_support::construct_runtime!(
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
pub const SS58Prefix: u8 = 42;
}
@@ -65,7 +64,6 @@ impl system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/cumulus/pallets/parachain-system/src/mock.rs b/cumulus/pallets/parachain-system/src/mock.rs
index e8d2eb70e26..da904c0079a 100644
--- a/cumulus/pallets/parachain-system/src/mock.rs
+++ b/cumulus/pallets/parachain-system/src/mock.rs
@@ -55,7 +55,6 @@ frame_support::construct_runtime!(
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
pub Version: RuntimeVersion = RuntimeVersion {
spec_name: sp_version::create_runtime_str!("test"),
impl_name: sp_version::create_runtime_str!("system-test"),
@@ -74,7 +73,6 @@ parameter_types! {
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type Block = Block;
- type BlockHashCount = BlockHashCount;
type Version = Version;
type OnSetCode = ParachainSetCode<Self>;
}
diff --git a/cumulus/pallets/xcmp-queue/src/mock.rs b/cumulus/pallets/xcmp-queue/src/mock.rs
index 97121aa78e9..dd87e07c33f 100644
--- a/cumulus/pallets/xcmp-queue/src/mock.rs
+++ b/cumulus/pallets/xcmp-queue/src/mock.rs
@@ -52,7 +52,6 @@ frame_support::construct_runtime!(
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
pub const SS58Prefix: u8 = 42;
}
@@ -73,7 +72,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/cumulus/parachains/common/src/impls.rs b/cumulus/parachains/common/src/impls.rs
index d70fdfeb709..ed9c5c483fa 100644
--- a/cumulus/parachains/common/src/impls.rs
+++ b/cumulus/parachains/common/src/impls.rs
@@ -222,7 +222,6 @@ mod tests {
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
pub BlockLength: limits::BlockLength = limits::BlockLength::max(2 * 1024);
pub const AvailableBlockRatio: Perbill = Perbill::one();
pub const MaxReserves: u32 = 50;
@@ -240,7 +239,6 @@ mod tests {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type BlockLength = BlockLength;
type BlockWeights = ();
type DbWeight = ();
diff --git a/cumulus/parachains/pallets/collective-content/src/mock.rs b/cumulus/parachains/pallets/collective-content/src/mock.rs
index 5cb0126425e..91f9c29933d 100644
--- a/cumulus/parachains/pallets/collective-content/src/mock.rs
+++ b/cumulus/parachains/pallets/collective-content/src/mock.rs
@@ -18,9 +18,7 @@
pub use crate as pallet_collective_content;
use crate::WeightInfo;
use frame_support::{
- derive_impl, ord_parameter_types, parameter_types,
- traits::{ConstU32, ConstU64},
- weights::Weight,
+ derive_impl, ord_parameter_types, parameter_types, traits::ConstU32, weights::Weight,
};
use frame_system::EnsureSignedBy;
use sp_runtime::{traits::IdentityLookup, BuildStorage};
@@ -70,7 +68,6 @@ impl frame_system::Config for Test {
type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/polkadot/runtime/common/src/assigned_slots/mod.rs b/polkadot/runtime/common/src/assigned_slots/mod.rs
index 9b24b99cfbe..92a8e46f5f9 100644
--- a/polkadot/runtime/common/src/assigned_slots/mod.rs
+++ b/polkadot/runtime/common/src/assigned_slots/mod.rs
@@ -671,10 +671,6 @@ mod tests {
type OverarchingCall = RuntimeCall;
}
- parameter_types! {
- pub const BlockHashCount: u32 = 250;
- }
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type BaseCallFilter = frame_support::traits::Everything;
@@ -689,7 +685,6 @@ mod tests {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type DbWeight = ();
type Version = ();
type PalletInfo = PalletInfo;
diff --git a/polkadot/runtime/common/src/auctions.rs b/polkadot/runtime/common/src/auctions.rs
index aa4caac96f1..e7b7c081ae4 100644
--- a/polkadot/runtime/common/src/auctions.rs
+++ b/polkadot/runtime/common/src/auctions.rs
@@ -699,10 +699,6 @@ mod tests {
}
);
- parameter_types! {
- pub const BlockHashCount: u32 = 250;
- }
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type BaseCallFilter = frame_support::traits::Everything;
@@ -718,7 +714,6 @@ mod tests {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/polkadot/runtime/common/src/crowdloan/mod.rs b/polkadot/runtime/common/src/crowdloan/mod.rs
index 477530467fa..0aecbcd531c 100644
--- a/polkadot/runtime/common/src/crowdloan/mod.rs
+++ b/polkadot/runtime/common/src/crowdloan/mod.rs
@@ -890,10 +890,6 @@ mod tests {
}
);
- parameter_types! {
- pub const BlockHashCount: u32 = 250;
- }
-
type BlockNumber = u64;
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
@@ -911,7 +907,6 @@ mod tests {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/polkadot/runtime/common/src/impls.rs b/polkadot/runtime/common/src/impls.rs
index 85531e9c04f..a92a05219cf 100644
--- a/polkadot/runtime/common/src/impls.rs
+++ b/polkadot/runtime/common/src/impls.rs
@@ -276,7 +276,6 @@ mod tests {
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
pub BlockWeights: limits::BlockWeights = limits::BlockWeights::builder()
.base_block(Weight::from_parts(10, 0))
.for_class(DispatchClass::all(), |weight| {
@@ -302,7 +301,6 @@ mod tests {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type BlockLength = BlockLength;
type BlockWeights = BlockWeights;
type DbWeight = ();
diff --git a/polkadot/runtime/common/src/integration_tests.rs b/polkadot/runtime/common/src/integration_tests.rs
index 3e9ac1fc1b1..2122e75f3e2 100644
--- a/polkadot/runtime/common/src/integration_tests.rs
+++ b/polkadot/runtime/common/src/integration_tests.rs
@@ -109,7 +109,6 @@ where
use crate::{auctions::Error as AuctionsError, crowdloan::Error as CrowdloanError};
parameter_types! {
- pub const BlockHashCount: u32 = 250;
pub BlockWeights: frame_system::limits::BlockWeights =
frame_system::limits::BlockWeights::simple_max(
Weight::from_parts(4 * 1024 * 1024, u64::MAX),
@@ -131,7 +130,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<Balance>;
diff --git a/polkadot/runtime/common/src/paras_registrar/mod.rs b/polkadot/runtime/common/src/paras_registrar/mod.rs
index a49ebab3e26..c90802a4012 100644
--- a/polkadot/runtime/common/src/paras_registrar/mod.rs
+++ b/polkadot/runtime/common/src/paras_registrar/mod.rs
@@ -761,7 +761,6 @@ mod tests {
const NORMAL_RATIO: Perbill = Perbill::from_percent(75);
parameter_types! {
- pub const BlockHashCount: u32 = 250;
pub BlockWeights: limits::BlockWeights =
frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, u64::MAX));
pub BlockLength: limits::BlockLength =
@@ -780,7 +779,6 @@ mod tests {
type Lookup = IdentityLookup<u64>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type DbWeight = ();
type BlockWeights = BlockWeights;
type BlockLength = BlockLength;
diff --git a/polkadot/runtime/common/src/purchase.rs b/polkadot/runtime/common/src/purchase.rs
index b90bbb3a7cf..3920a2c68c5 100644
--- a/polkadot/runtime/common/src/purchase.rs
+++ b/polkadot/runtime/common/src/purchase.rs
@@ -508,10 +508,6 @@ mod tests {
type AccountId = AccountId32;
- parameter_types! {
- pub const BlockHashCount: u32 = 250;
- }
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type BaseCallFilter = frame_support::traits::Everything;
@@ -527,7 +523,6 @@ mod tests {
type Lookup = IdentityLookup<AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/polkadot/runtime/common/src/slots/mod.rs b/polkadot/runtime/common/src/slots/mod.rs
index 738569ff441..9da345beea3 100644
--- a/polkadot/runtime/common/src/slots/mod.rs
+++ b/polkadot/runtime/common/src/slots/mod.rs
@@ -525,10 +525,6 @@ mod tests {
}
);
- parameter_types! {
- pub const BlockHashCount: u32 = 250;
- }
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type BaseCallFilter = frame_support::traits::Everything;
@@ -543,7 +539,6 @@ mod tests {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type DbWeight = ();
type Version = ();
type PalletInfo = PalletInfo;
diff --git a/polkadot/runtime/parachains/src/mock.rs b/polkadot/runtime/parachains/src/mock.rs
index a32c9d11b36..75b835b1754 100644
--- a/polkadot/runtime/parachains/src/mock.rs
+++ b/polkadot/runtime/parachains/src/mock.rs
@@ -100,7 +100,6 @@ where
}
parameter_types! {
- pub const BlockHashCount: u32 = 250;
pub static BlockWeights: frame_system::limits::BlockWeights =
frame_system::limits::BlockWeights::simple_max(
Weight::from_parts(4 * 1024 * 1024, u64::MAX),
@@ -125,7 +124,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<u64>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u128>;
diff --git a/polkadot/xcm/pallet-xcm/src/mock.rs b/polkadot/xcm/pallet-xcm/src/mock.rs
index b3b7529217f..ead98e1d046 100644
--- a/polkadot/xcm/pallet-xcm/src/mock.rs
+++ b/polkadot/xcm/pallet-xcm/src/mock.rs
@@ -238,10 +238,6 @@ impl SendXcm for TestPaidForPara3000SendXcm {
}
}
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
-}
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type RuntimeOrigin = RuntimeOrigin;
@@ -253,7 +249,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type BlockWeights = ();
type BlockLength = ();
type Version = ();
diff --git a/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs b/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
index 34b204b434d..076ff4184f0 100644
--- a/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
+++ b/polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
@@ -54,7 +54,6 @@ impl frame_system::Config for Test {
type Block = Block;
type AccountData = pallet_balances::AccountData<Balance>;
type AccountId = AccountId;
- type BlockHashCount = ConstU32<256>;
type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
}
diff --git a/polkadot/xcm/xcm-builder/tests/mock/mod.rs b/polkadot/xcm/xcm-builder/tests/mock/mod.rs
index 45bfba23556..7f7ff17e211 100644
--- a/polkadot/xcm/xcm-builder/tests/mock/mod.rs
+++ b/polkadot/xcm/xcm-builder/tests/mock/mod.rs
@@ -74,10 +74,6 @@ pub type TestXcmRouter = EnsureDecodableXcm<TestSendXcm>;
pub const UNITS: Balance = 1_000_000_000_000;
pub const CENTS: Balance = UNITS / 30_000;
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
-}
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Runtime {
type RuntimeOrigin = RuntimeOrigin;
@@ -89,7 +85,6 @@ impl frame_system::Config for Runtime {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type BlockWeights = ();
type BlockLength = ();
type Version = ();
diff --git a/substrate/frame/alliance/src/mock.rs b/substrate/frame/alliance/src/mock.rs
index 7116e69efa1..a9cfd6d0fde 100644
--- a/substrate/frame/alliance/src/mock.rs
+++ b/substrate/frame/alliance/src/mock.rs
@@ -42,7 +42,6 @@ type BlockNumber = u64;
type AccountId = u64;
parameter_types! {
- pub const BlockHashCount: BlockNumber = 250;
pub BlockWeights: frame_system::limits::BlockWeights =
frame_system::limits::BlockWeights::simple_max(Weight::MAX);
}
diff --git a/substrate/frame/contracts/mock-network/src/parachain.rs b/substrate/frame/contracts/mock-network/src/parachain.rs
index b46d7df6c2b..f35846ba32c 100644
--- a/substrate/frame/contracts/mock-network/src/parachain.rs
+++ b/substrate/frame/contracts/mock-network/src/parachain.rs
@@ -49,10 +49,6 @@ use xcm_executor::{traits::JustTry, Config, XcmExecutor};
pub type SovereignAccountOf =
(AccountId32Aliases<RelayNetwork, AccountId>, ParentIsPreset<AccountId>);
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
-}
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Runtime {
type RuntimeOrigin = RuntimeOrigin;
@@ -64,7 +60,6 @@ impl frame_system::Config for Runtime {
type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type BlockWeights = ();
type BlockLength = ();
type Version = ();
diff --git a/substrate/frame/contracts/mock-network/src/relay_chain.rs b/substrate/frame/contracts/mock-network/src/relay_chain.rs
index 36a7de499ba..8829fff3d04 100644
--- a/substrate/frame/contracts/mock-network/src/relay_chain.rs
+++ b/substrate/frame/contracts/mock-network/src/relay_chain.rs
@@ -43,10 +43,6 @@ use super::{
primitives::{AccountId, Balance},
};
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
-}
-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Runtime {
type RuntimeOrigin = RuntimeOrigin;
@@ -58,7 +54,6 @@ impl frame_system::Config for Runtime {
type AccountId = AccountId;
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type BlockWeights = ();
type BlockLength = ();
type Version = ();
diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
index a9512bef2d5..e5987ec33f0 100644
--- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
+++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
@@ -90,7 +90,6 @@ pub(crate) type Moment = u32;
impl frame_system::Config for Runtime {
type Block = Block;
type AccountData = pallet_balances::AccountData<Balance>;
- type BlockHashCount = ConstU32<10>;
}
const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
diff --git a/substrate/frame/examples/basic/src/tests.rs b/substrate/frame/examples/basic/src/tests.rs
index de37bcf7556..d351b27eecd 100644
--- a/substrate/frame/examples/basic/src/tests.rs
+++ b/substrate/frame/examples/basic/src/tests.rs
@@ -60,7 +60,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/substrate/frame/examples/dev-mode/src/tests.rs b/substrate/frame/examples/dev-mode/src/tests.rs
index 1c79b5f5fa6..e8a18ec13fe 100644
--- a/substrate/frame/examples/dev-mode/src/tests.rs
+++ b/substrate/frame/examples/dev-mode/src/tests.rs
@@ -54,7 +54,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/substrate/frame/examples/offchain-worker/src/tests.rs b/substrate/frame/examples/offchain-worker/src/tests.rs
index 3525b3b67ed..e2c57a8c1e1 100644
--- a/substrate/frame/examples/offchain-worker/src/tests.rs
+++ b/substrate/frame/examples/offchain-worker/src/tests.rs
@@ -61,7 +61,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/substrate/frame/im-online/src/mock.rs b/substrate/frame/im-online/src/mock.rs
index cc448dc1ae1..2aff9a0e26d 100644
--- a/substrate/frame/im-online/src/mock.rs
+++ b/substrate/frame/im-online/src/mock.rs
@@ -127,7 +127,6 @@ impl frame_system::Config for Runtime {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/substrate/frame/indices/src/mock.rs b/substrate/frame/indices/src/mock.rs
index 9f8bf8c3758..87b8d79a7f8 100644
--- a/substrate/frame/indices/src/mock.rs
+++ b/substrate/frame/indices/src/mock.rs
@@ -53,7 +53,6 @@ impl frame_system::Config for Test {
type Lookup = Indices;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/substrate/frame/multisig/src/tests.rs b/substrate/frame/multisig/src/tests.rs
index 0d73e3db661..cfdd33f7dfc 100644
--- a/substrate/frame/multisig/src/tests.rs
+++ b/substrate/frame/multisig/src/tests.rs
@@ -41,7 +41,6 @@ frame_support::construct_runtime!(
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type Block = Block;
- type BlockHashCount = ConstU32<250>;
type AccountData = pallet_balances::AccountData<u64>;
// This pallet wishes to overwrite this.
type BaseCallFilter = TestBaseCallFilter;
diff --git a/substrate/frame/offences/src/mock.rs b/substrate/frame/offences/src/mock.rs
index 9a3120e41ea..1725f4158d3 100644
--- a/substrate/frame/offences/src/mock.rs
+++ b/substrate/frame/offences/src/mock.rs
@@ -24,7 +24,7 @@ use crate::Config;
use codec::Encode;
use frame_support::{
derive_impl, parameter_types,
- traits::{ConstU32, ConstU64},
+ traits::ConstU32,
weights::{constants::RocksDbWeight, Weight},
};
use sp_core::H256;
@@ -88,7 +88,6 @@ impl frame_system::Config for Runtime {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/substrate/frame/paged-list/src/mock.rs b/substrate/frame/paged-list/src/mock.rs
index 5d06170aae7..e086b4ba2b2 100644
--- a/substrate/frame/paged-list/src/mock.rs
+++ b/substrate/frame/paged-list/src/mock.rs
@@ -20,10 +20,7 @@
#![cfg(feature = "std")]
use crate::{paged_list::StoragePagedListMeta, Config, ListPrefix};
-use frame_support::{
- derive_impl,
- traits::{ConstU16, ConstU64},
-};
+use frame_support::{derive_impl, traits::ConstU16};
use sp_core::H256;
use sp_runtime::{
traits::{BlakeTwo256, IdentityLookup},
@@ -56,7 +53,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/substrate/frame/safe-mode/src/mock.rs b/substrate/frame/safe-mode/src/mock.rs
index fbfc16f4aa2..0beb911267d 100644
--- a/substrate/frame/safe-mode/src/mock.rs
+++ b/substrate/frame/safe-mode/src/mock.rs
@@ -47,7 +47,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type DbWeight = ();
type Version = ();
type PalletInfo = PalletInfo;
diff --git a/substrate/frame/state-trie-migration/src/lib.rs b/substrate/frame/state-trie-migration/src/lib.rs
index 5c54c27966c..4ec649f9080 100644
--- a/substrate/frame/state-trie-migration/src/lib.rs
+++ b/substrate/frame/state-trie-migration/src/lib.rs
@@ -1103,11 +1103,7 @@ mod benchmarks {
mod mock {
use super::*;
use crate as pallet_state_trie_migration;
- use frame_support::{
- derive_impl, parameter_types,
- traits::{ConstU32, Hooks},
- weights::Weight,
- };
+ use frame_support::{derive_impl, parameter_types, traits::Hooks, weights::Weight};
use frame_system::{EnsureRoot, EnsureSigned};
use sp_core::{
storage::{ChildInfo, StateVersion},
@@ -1134,7 +1130,6 @@ mod mock {
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type Block = Block;
- type BlockHashCount = ConstU32<250>;
type AccountData = pallet_balances::AccountData<u64>;
}
diff --git a/substrate/frame/support/test/tests/final_keys.rs b/substrate/frame/support/test/tests/final_keys.rs
index a777c20a1e9..64f56d52003 100644
--- a/substrate/frame/support/test/tests/final_keys.rs
+++ b/substrate/frame/support/test/tests/final_keys.rs
@@ -19,7 +19,7 @@ use codec::Encode;
use frame_support::{derive_impl, storage::unhashed, StoragePrefixedMap};
use frame_system::pallet_prelude::BlockNumberFor;
-use sp_core::{sr25519, ConstU32};
+use sp_core::sr25519;
use sp_io::{
hashing::{blake2_128, twox_128, twox_64},
TestExternalities,
@@ -213,7 +213,6 @@ frame_support::construct_runtime!(
impl frame_system::Config for Runtime {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU32<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/genesisconfig.rs b/substrate/frame/support/test/tests/genesisconfig.rs
index a82425cf6be..0673bcfdff3 100644
--- a/substrate/frame/support/test/tests/genesisconfig.rs
+++ b/substrate/frame/support/test/tests/genesisconfig.rs
@@ -17,7 +17,7 @@
use frame_support::derive_impl;
use frame_system::pallet_prelude::BlockNumberFor;
-use sp_core::{sr25519, ConstU32};
+use sp_core::sr25519;
use sp_runtime::{
generic,
traits::{BlakeTwo256, Verify},
@@ -83,7 +83,6 @@ frame_support::construct_runtime!(
impl frame_system::Config for Test {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU32<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/instance.rs b/substrate/frame/support/test/tests/instance.rs
index 332f5725e05..30b8338bc5c 100644
--- a/substrate/frame/support/test/tests/instance.rs
+++ b/substrate/frame/support/test/tests/instance.rs
@@ -293,7 +293,6 @@ frame_support::construct_runtime!(
impl frame_system::Config for Runtime {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU32<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/issue2219.rs b/substrate/frame/support/test/tests/issue2219.rs
index 1542c4a6c43..20c2773406f 100644
--- a/substrate/frame/support/test/tests/issue2219.rs
+++ b/substrate/frame/support/test/tests/issue2219.rs
@@ -165,7 +165,6 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
impl frame_system::Config for Runtime {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU64<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/origin.rs b/substrate/frame/support/test/tests/origin.rs
index a25c575cc51..4f14bda184c 100644
--- a/substrate/frame/support/test/tests/origin.rs
+++ b/substrate/frame/support/test/tests/origin.rs
@@ -23,7 +23,6 @@ use frame_support::{
derive_impl,
traits::{Contains, OriginTrait},
};
-use sp_core::ConstU32;
use sp_runtime::{generic, traits::BlakeTwo256};
mod nested {
@@ -174,7 +173,6 @@ frame_support::construct_runtime!(
impl frame_system::Config for RuntimeOriginTest {
type BaseCallFilter = BaseCallFilter;
type Block = Block;
- type BlockHashCount = ConstU32<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/pallet.rs b/substrate/frame/support/test/tests/pallet.rs
index f41e606ad7c..c441d4c371a 100644
--- a/substrate/frame/support/test/tests/pallet.rs
+++ b/substrate/frame/support/test/tests/pallet.rs
@@ -705,7 +705,6 @@ impl frame_system::Config for Runtime {
type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU32<250>;
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
diff --git a/substrate/frame/support/test/tests/pallet_instance.rs b/substrate/frame/support/test/tests/pallet_instance.rs
index c79cdf93e97..dfe4caa476d 100644
--- a/substrate/frame/support/test/tests/pallet_instance.rs
+++ b/substrate/frame/support/test/tests/pallet_instance.rs
@@ -308,7 +308,6 @@ impl frame_system::Config for Runtime {
type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU32<250>;
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
diff --git a/substrate/frame/support/test/tests/pallet_outer_enums_explicit.rs b/substrate/frame/support/test/tests/pallet_outer_enums_explicit.rs
index 6c71b544426..326f3530e26 100644
--- a/substrate/frame/support/test/tests/pallet_outer_enums_explicit.rs
+++ b/substrate/frame/support/test/tests/pallet_outer_enums_explicit.rs
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use frame_support::{derive_impl, traits::ConstU32};
+use frame_support::derive_impl;
mod common;
@@ -29,7 +29,6 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Runti
impl frame_system::Config for Runtime {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU32<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/pallet_outer_enums_implicit.rs b/substrate/frame/support/test/tests/pallet_outer_enums_implicit.rs
index 79828119742..4149c4880cc 100644
--- a/substrate/frame/support/test/tests/pallet_outer_enums_implicit.rs
+++ b/substrate/frame/support/test/tests/pallet_outer_enums_implicit.rs
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use frame_support::{derive_impl, traits::ConstU32};
+use frame_support::derive_impl;
mod common;
@@ -29,7 +29,6 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, Runti
impl frame_system::Config for Runtime {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU32<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs b/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
index e4ea094d069..3386632c13a 100644
--- a/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
+++ b/substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs
@@ -82,7 +82,6 @@ impl frame_system::Config for Runtime {
type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU32<250>;
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
diff --git a/substrate/frame/support/test/tests/runtime.rs b/substrate/frame/support/test/tests/runtime.rs
index 7c2a8139a13..1f4d9110a24 100644
--- a/substrate/frame/support/test/tests/runtime.rs
+++ b/substrate/frame/support/test/tests/runtime.rs
@@ -27,7 +27,7 @@ use frame_support::{
};
use frame_system::limits::{BlockLength, BlockWeights};
use scale_info::TypeInfo;
-use sp_core::{sr25519, ConstU64};
+use sp_core::sr25519;
use sp_runtime::{
generic,
traits::{BlakeTwo256, ValidateUnsigned, Verify},
@@ -351,7 +351,6 @@ impl frame_system::Config for Runtime {
type PalletInfo = PalletInfo;
type OnSetCode = ();
type Block = Block;
- type BlockHashCount = ConstU64<10>;
}
impl module1::Config<module1::Instance1> for Runtime {
diff --git a/substrate/frame/support/test/tests/runtime_legacy_ordering.rs b/substrate/frame/support/test/tests/runtime_legacy_ordering.rs
index 4c7012dca14..5b74cc172c6 100644
--- a/substrate/frame/support/test/tests/runtime_legacy_ordering.rs
+++ b/substrate/frame/support/test/tests/runtime_legacy_ordering.rs
@@ -27,7 +27,7 @@ use frame_support::{
};
use frame_system::limits::{BlockLength, BlockWeights};
use scale_info::TypeInfo;
-use sp_core::{sr25519, ConstU64};
+use sp_core::sr25519;
use sp_runtime::{
generic,
traits::{BlakeTwo256, ValidateUnsigned, Verify},
@@ -351,7 +351,6 @@ impl frame_system::Config for Runtime {
type PalletInfo = PalletInfo;
type OnSetCode = ();
type Block = Block;
- type BlockHashCount = ConstU64<10>;
}
impl module1::Config<module1::Instance1> for Runtime {
diff --git a/substrate/frame/support/test/tests/runtime_metadata.rs b/substrate/frame/support/test/tests/runtime_metadata.rs
index 819ec176d2b..48e4d975eb0 100644
--- a/substrate/frame/support/test/tests/runtime_metadata.rs
+++ b/substrate/frame/support/test/tests/runtime_metadata.rs
@@ -42,7 +42,6 @@ impl frame_system::Config for Runtime {
type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU32<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/substrate/frame/support/test/tests/storage_layers.rs b/substrate/frame/support/test/tests/storage_layers.rs
index caa125153e9..0e8ef668531 100644
--- a/substrate/frame/support/test/tests/storage_layers.rs
+++ b/substrate/frame/support/test/tests/storage_layers.rs
@@ -78,7 +78,6 @@ impl frame_system::Config for Runtime {
type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU32<250>;
type DbWeight = ();
type Version = ();
type PalletInfo = PalletInfo;
diff --git a/substrate/frame/support/test/tests/storage_transaction.rs b/substrate/frame/support/test/tests/storage_transaction.rs
index a5bbfd24ab0..7f66a43b9af 100644
--- a/substrate/frame/support/test/tests/storage_transaction.rs
+++ b/substrate/frame/support/test/tests/storage_transaction.rs
@@ -24,7 +24,7 @@ use frame_support::{
storage::{with_transaction, TransactionOutcome::*},
transactional,
};
-use sp_core::{sr25519, ConstU32};
+use sp_core::sr25519;
use sp_io::TestExternalities;
use sp_runtime::{
generic,
@@ -91,7 +91,6 @@ frame_support::construct_runtime!(
impl frame_system::Config for Runtime {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU32<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/support/test/tests/versioned_migration.rs b/substrate/frame/support/test/tests/versioned_migration.rs
index e7d146940cb..c83dd6b71de 100644
--- a/substrate/frame/support/test/tests/versioned_migration.rs
+++ b/substrate/frame/support/test/tests/versioned_migration.rs
@@ -27,7 +27,6 @@ use frame_support::{
weights::constants::RocksDbWeight,
};
use frame_system::Config;
-use sp_core::ConstU64;
use sp_runtime::BuildStorage;
type Block = frame_system::mocking::MockBlock<Test>;
@@ -75,7 +74,6 @@ construct_runtime!(
impl frame_system::Config for Test {
type BaseCallFilter = frame_support::traits::Everything;
type Block = Block;
- type BlockHashCount = ConstU64<10>;
type RuntimeOrigin = RuntimeOrigin;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/system/benches/bench.rs b/substrate/frame/system/benches/bench.rs
index 87c5581b2a3..b3029630409 100644
--- a/substrate/frame/system/benches/bench.rs
+++ b/substrate/frame/system/benches/bench.rs
@@ -16,10 +16,7 @@
// limitations under the License.
use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use frame_support::{
- derive_impl,
- traits::{ConstU32, ConstU64},
-};
+use frame_support::{derive_impl, traits::ConstU32};
use sp_core::H256;
use sp_runtime::{
traits::{BlakeTwo256, IdentityLookup},
@@ -75,7 +72,6 @@ impl frame_system::Config for Runtime {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/substrate/frame/system/src/lib.rs b/substrate/frame/system/src/lib.rs
index 7ed954d83aa..84d00a1e917 100644
--- a/substrate/frame/system/src/lib.rs
+++ b/substrate/frame/system/src/lib.rs
@@ -262,7 +262,19 @@ pub mod pallet {
/// Default implementations of [`DefaultConfig`], which can be used to implement [`Config`].
pub mod config_preludes {
use super::{inject_runtime_type, DefaultConfig};
- use frame_support::derive_impl;
+ use frame_support::{derive_impl, traits::Get};
+
+ /// A predefined adapter that covers `BlockNumberFor<T>` for `Config::Block::BlockNumber` of
+ /// the types `u32`, `u64`, and `u128`.
+ ///
+ /// NOTE: Avoids overriding `BlockHashCount` when using `mocking::{MockBlock, MockBlockU32,
+ /// MockBlockU128}`.
+ pub struct TestBlockHashCount<C: Get<u32>>(sp_std::marker::PhantomData<C>);
+ impl<I: From<u32>, C: Get<u32>> Get<I> for TestBlockHashCount<C> {
+ fn get() -> I {
+ C::get().into()
+ }
+ }
/// Provides a viable default config that can be used with
/// [`derive_impl`](`frame_support::derive_impl`) to derive a testing pallet config
@@ -300,7 +312,7 @@ pub mod pallet {
#[inject_runtime_type]
type RuntimeTask = ();
type BaseCallFilter = frame_support::traits::Everything;
- type BlockHashCount = frame_support::traits::ConstU64<10>;
+ type BlockHashCount = TestBlockHashCount<frame_support::traits::ConstU32<10>>;
type OnSetCode = ();
type SingleBlockMigrations = ();
type MultiBlockMigrator = ();
@@ -397,7 +409,7 @@ pub mod pallet {
/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
/// Using 256 as default.
- type BlockHashCount = frame_support::traits::ConstU32<256>;
+ type BlockHashCount = TestBlockHashCount<frame_support::traits::ConstU32<256>>;
/// The set code logic, just the default since we're not a parachain.
type OnSetCode = ();
diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs b/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs
index 9a2b22b8170..0cafb35d52e 100644
--- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs
+++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs
@@ -100,7 +100,6 @@ impl frame_system::Config for Runtime {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs b/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs
index b04d4ffd9e0..f27fcd53fec 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs
+++ b/substrate/frame/transaction-payment/asset-tx-payment/src/mock.rs
@@ -86,7 +86,6 @@ impl frame_system::Config for Runtime {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/substrate/frame/transaction-payment/src/mock.rs b/substrate/frame/transaction-payment/src/mock.rs
index c1bb05ab5c7..1ef95128f2a 100644
--- a/substrate/frame/transaction-payment/src/mock.rs
+++ b/substrate/frame/transaction-payment/src/mock.rs
@@ -85,7 +85,6 @@ impl frame_system::Config for Runtime {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
diff --git a/substrate/frame/transaction-storage/src/mock.rs b/substrate/frame/transaction-storage/src/mock.rs
index f1e9e0591f6..73174b73dba 100644
--- a/substrate/frame/transaction-storage/src/mock.rs
+++ b/substrate/frame/transaction-storage/src/mock.rs
@@ -23,7 +23,7 @@ use crate::{
};
use frame_support::{
derive_impl,
- traits::{ConstU32, ConstU64, OnFinalize, OnInitialize},
+ traits::{ConstU32, OnFinalize, OnInitialize},
};
use sp_runtime::{traits::IdentityLookup, BuildStorage};
@@ -44,7 +44,6 @@ impl frame_system::Config for Test {
type Block = Block;
type AccountData = pallet_balances::AccountData<u64>;
type AccountId = u64;
- type BlockHashCount = ConstU64<250>;
type Lookup = IdentityLookup<Self::AccountId>;
}
diff --git a/substrate/frame/tx-pause/src/mock.rs b/substrate/frame/tx-pause/src/mock.rs
index 5206023838b..7245fe7d5d7 100644
--- a/substrate/frame/tx-pause/src/mock.rs
+++ b/substrate/frame/tx-pause/src/mock.rs
@@ -33,9 +33,6 @@ use sp_runtime::{
BuildStorage,
};
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
-}
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
impl frame_system::Config for Test {
type BaseCallFilter = InsideBoth<Everything, TxPause>;
@@ -50,7 +47,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
type Block = Block;
- type BlockHashCount = BlockHashCount;
type DbWeight = ();
type Version = ();
type PalletInfo = PalletInfo;
diff --git a/templates/parachain/pallets/template/src/mock.rs b/templates/parachain/pallets/template/src/mock.rs
index 8a88be3e3e9..9a907f61660 100644
--- a/templates/parachain/pallets/template/src/mock.rs
+++ b/templates/parachain/pallets/template/src/mock.rs
@@ -18,7 +18,6 @@ frame_support::construct_runtime!(
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
pub const SS58Prefix: u8 = 42;
}
@@ -37,7 +36,6 @@ impl system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
diff --git a/templates/solochain/pallets/template/src/mock.rs b/templates/solochain/pallets/template/src/mock.rs
index 3f1fd2dd6d4..09081dae062 100644
--- a/templates/solochain/pallets/template/src/mock.rs
+++ b/templates/solochain/pallets/template/src/mock.rs
@@ -1,8 +1,5 @@
use crate as pallet_template;
-use frame_support::{
- derive_impl,
- traits::{ConstU16, ConstU64},
-};
+use frame_support::{derive_impl, traits::ConstU16};
use sp_core::H256;
use sp_runtime::{
traits::{BlakeTwo256, IdentityLookup},
@@ -35,7 +32,6 @@ impl frame_system::Config for Test {
type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
type Version = ();
type PalletInfo = PalletInfo;
type AccountData = ();
--
GitLab