Skip to content

Commit

Permalink
Attempt to avoid specifying BlockHashCount for different `mocking::…
Browse files Browse the repository at this point in the history 
…{MockBlock, MockBlockU32, MockBlockU128}` (paritytech#4543)

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:
paritytech@3c5499e.
The second commit is just removal of `BlockHashCount` from all other
places where not needed by default.

Closes: paritytech#1657

---------

Co-authored-by: Bastian Köcher <[email protected]>
  • Loading branch information
@bkontur @bkchr
bkontur and bkchr authored May 24, 2024
1 parent 700d591 commit ef144b1
Show file tree
Hide file tree
Showing 60 changed files with 30 additions and 150 deletions.
1 change: 0 additions & 1 deletion bridges/bin/runtime-common/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions bridges/snowbridge/pallets/inbound-queue/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand All @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions bridges/snowbridge/pallets/outbound-queue/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions bridges/snowbridge/pallets/system/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions cumulus/pallets/collator-selection/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ frame_support::construct_runtime!(
);

parameter_types! {
pub const BlockHashCount: u64 = 250;
pub const SS58Prefix: u8 = 42;
}

Expand All @@ -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>;
Expand Down
2 changes: 0 additions & 2 deletions cumulus/pallets/parachain-system/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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>;
}
Expand Down
2 changes: 0 additions & 2 deletions cumulus/pallets/xcmp-queue/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ frame_support::construct_runtime!(
);

parameter_types! {
pub const BlockHashCount: u64 = 250;
pub const SS58Prefix: u8 = 42;
}

Expand All @@ -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>;
Expand Down
2 changes: 0 additions & 2 deletions cumulus/parachains/common/src/impls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 = ();
Expand Down
5 changes: 1 addition & 4 deletions cumulus/parachains/pallets/collective-content/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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 = ();
Expand Down
5 changes: 0 additions & 5 deletions polkadot/runtime/common/src/assigned_slots/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions polkadot/runtime/common/src/auctions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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>;
Expand Down
5 changes: 0 additions & 5 deletions polkadot/runtime/common/src/crowdloan/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,10 +890,6 @@ mod tests {
}
);

parameter_types! {
pub const BlockHashCount: u32 = 250;
}

type BlockNumber = u64;

#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
Expand All @@ -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>;
Expand Down
2 changes: 0 additions & 2 deletions polkadot/runtime/common/src/impls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand All @@ -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 = ();
Expand Down
2 changes: 0 additions & 2 deletions polkadot/runtime/common/src/integration_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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>;
Expand Down
2 changes: 0 additions & 2 deletions polkadot/runtime/common/src/paras_registrar/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions polkadot/runtime/common/src/purchase.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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>;
Expand Down
5 changes: 0 additions & 5 deletions polkadot/runtime/common/src/slots/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions polkadot/runtime/parachains/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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>;
Expand Down
5 changes: 0 additions & 5 deletions polkadot/xcm/pallet-xcm/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 = ();
Expand Down
1 change: 0 additions & 1 deletion polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
}

Expand Down
5 changes: 0 additions & 5 deletions polkadot/xcm/xcm-builder/tests/mock/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 = ();
Expand Down
1 change: 0 additions & 1 deletion substrate/frame/alliance/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
5 changes: 0 additions & 5 deletions substrate/frame/contracts/mock-network/src/parachain.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 = ();
Expand Down
5 changes: 0 additions & 5 deletions substrate/frame/contracts/mock-network/src/relay_chain.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 = ();
Expand Down
Loading

0 comments on commit ef144b1

Please sign in to comment.