Skip to content

Use "original" type for BlockWeights #1742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notlesh merged 1 commit into from
Aug 11, 2022
+8 −4
Merged

Use "original" type for BlockWeights #1742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions runtime/moonbase/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ use frame_support::{

#[cfg(feature = "std")]
pub use fp_evm::GenesisAccount;
use frame_system::{limits::BlockWeights, EnsureRoot, EnsureSigned};
use frame_system::{EnsureRoot, EnsureSigned};
pub use moonbeam_core_primitives::{
AccountId, AccountIndex, Address, AssetId, Balance, BlockNumber, DigestItem, Hash, Header,
Index, Signature,
Expand Down Expand Up @@ -199,9 +199,9 @@ const NORMAL_WEIGHT: Weight = MAXIMUM_BLOCK_WEIGHT * 3 / 4;
pub const EXTRINSIC_BASE_WEIGHT: Weight = 10000 * WEIGHT_PER_GAS;

pub struct RuntimeBlockWeights;
impl Get<BlockWeights> for RuntimeBlockWeights {
fn get() -> BlockWeights {
BlockWeights::builder()
impl Get<frame_system::limits::BlockWeights> for RuntimeBlockWeights {
fn get() -> frame_system::limits::BlockWeights {
frame_system::limits::BlockWeights::builder()
.for_class(DispatchClass::Normal, |weights| {
weights.base_extrinsic = EXTRINSIC_BASE_WEIGHT;
weights.max_total = NORMAL_WEIGHT.into();
Expand All @@ -218,6 +218,10 @@ impl Get<BlockWeights> for RuntimeBlockWeights {

parameter_types! {
pub const Version: RuntimeVersion = VERSION;
/// TODO: this is left here so that `impl_runtime_apis_plus_common` will find the same type for
/// `BlockWeights` in all runtimes. It can probably be removed once the custom
/// `RuntimeBlockWeights` has been pushed to each runtime.
pub BlockWeights: frame_system::limits::BlockWeights = RuntimeBlockWeights::get();
/// We allow for 5 MB blocks.
pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength
::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
Expand Down