Make weights compatible with u64 (#4192)

* Use Weight instead of u32 everywhere

* Revert Weight declaration

* Fix benches
This commit is contained in:
Stanislav Tkach
2019-11-29 21:20:20 +02:00
committed by Bastian Köcher
parent 1ceebb5c3a
commit 3e3ec05e56
32 changed files with 73 additions and 62 deletions
+2 -2
View File
@@ -393,7 +393,7 @@ mod tests {
pub struct Runtime;
parameter_types! {
pub const BlockHashCount: u64 = 250;
pub const MaximumBlockWeight: u32 = 1024;
pub const MaximumBlockWeight: Weight = 1024;
pub const MaximumBlockLength: u32 = 2 * 1024;
pub const AvailableBlockRatio: Perbill = Perbill::one();
}
@@ -641,7 +641,7 @@ mod tests {
assert!(Executive::apply_extrinsic(x2.clone()).unwrap().is_ok());
// default weight for `TestXt` == encoded length.
assert_eq!(<system::Module<Runtime>>::all_extrinsics_weight(), (3 * len) as u32);
assert_eq!(<system::Module<Runtime>>::all_extrinsics_weight(), (3 * len) as Weight);
assert_eq!(<system::Module<Runtime>>::all_extrinsics_len(), 3 * len);
let _ = <system::Module<Runtime>>::finalize();