pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 14:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 'note_applied_extrinsic' - consider also 'extract_actual_pays_fee' (#11849)

Browse Source
This commit is contained in:
Branislav Kontur
2022-07-23 20:01:57 +02:00
committed by GitHub
parent afc723cc30
commit b3bd5cee54
3 changed files with 157 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/system/src/lib.rs
+3 -2
View File
@@ -91,8 +91,8 @@ use frame_support::{
OriginTrait, PalletInfo, SortedMembers, StoredMap, TypedGet,
},
weights::{
extract_actual_weight, DispatchClass, DispatchInfo, PerDispatchClass, RuntimeDbWeight,
Weight,
extract_actual_pays_fee, extract_actual_weight, DispatchClass, DispatchInfo,
PerDispatchClass, RuntimeDbWeight, Weight,
},
Parameter,
};
@@ -1500,6 +1500,7 @@ impl<T: Config> Pallet<T> {
/// To be called immediately after an extrinsic has been applied.
pub fn note_applied_extrinsic(r: &DispatchResultWithPostInfo, mut info: DispatchInfo) {
info.weight = extract_actual_weight(r, &info);
info.pays_fee = extract_actual_pays_fee(r, &info);
Self::deposit_event(match r {
Ok(_) => Event::ExtrinsicSuccess { dispatch_info: info },
Err(err) => {
substrate/frame/system/src/tests.rs
+117 -2
View File
@@ -17,7 +17,9 @@
use crate::*;
use frame_support::{
assert_noop, assert_ok, dispatch::PostDispatchInfo, weights::WithPostDispatchInfo,
assert_noop, assert_ok,
dispatch::PostDispatchInfo,
weights::{Pays, WithPostDispatchInfo},
};
use mock::{Origin, *};
use sp_core::H256;
@@ -216,7 +218,7 @@ fn deposit_event_should_work() {
}
#[test]
fn deposit_event_uses_actual_weight() {
fn deposit_event_uses_actual_weight_and_pays_fee() {
new_test_ext().execute_with(|| {
System::reset_events();
System::initialize(&1, &[0u8; 32].into(), &Default::default());
@@ -230,8 +232,34 @@ fn deposit_event_uses_actual_weight() {
&Ok(Some(1200).into()),
pre_info,
);
System::note_applied_extrinsic(&Ok((Some(2_500_000), Pays::Yes).into()), pre_info);
System::note_applied_extrinsic(&Ok(Pays::No.into()), pre_info);
System::note_applied_extrinsic(&Ok((Some(2_500_000), Pays::No).into()), pre_info);
System::note_applied_extrinsic(&Ok((Some(500), Pays::No).into()), pre_info);
System::note_applied_extrinsic(&Err(DispatchError::BadOrigin.with_weight(999)), pre_info);
System::note_applied_extrinsic(
&Err(DispatchErrorWithPostInfo {
post_info: PostDispatchInfo { actual_weight: None, pays_fee: Pays::Yes },
error: DispatchError::BadOrigin,
}),
pre_info,
);
System::note_applied_extrinsic(
&Err(DispatchErrorWithPostInfo {
post_info: PostDispatchInfo { actual_weight: Some(800), pays_fee: Pays::Yes },
error: DispatchError::BadOrigin,
}),
pre_info,
);
System::note_applied_extrinsic(
&Err(DispatchErrorWithPostInfo {
post_info: PostDispatchInfo { actual_weight: Some(800), pays_fee: Pays::No },
error: DispatchError::BadOrigin,
}),
pre_info,
);
assert_eq!(
System::events(),
vec![
@@ -261,6 +289,54 @@ fn deposit_event_uses_actual_weight() {
},
EventRecord {
phase: Phase::ApplyExtrinsic(3),
event: SysEvent::ExtrinsicSuccess {
dispatch_info: DispatchInfo {
weight: 1000,
pays_fee: Pays::Yes,
..Default::default()
},
}
.into(),
topics: vec![]
},
EventRecord {
phase: Phase::ApplyExtrinsic(4),
event: SysEvent::ExtrinsicSuccess {
dispatch_info: DispatchInfo {
weight: 1000,
pays_fee: Pays::No,
..Default::default()
},
}
.into(),
topics: vec![]
},
EventRecord {
phase: Phase::ApplyExtrinsic(5),
event: SysEvent::ExtrinsicSuccess {
dispatch_info: DispatchInfo {
weight: 1000,
pays_fee: Pays::No,
..Default::default()
},
}
.into(),
topics: vec![]
},
EventRecord {
phase: Phase::ApplyExtrinsic(6),
event: SysEvent::ExtrinsicSuccess {
dispatch_info: DispatchInfo {
weight: 500,
pays_fee: Pays::No,
..Default::default()
},
}
.into(),
topics: vec![]
},
EventRecord {
phase: Phase::ApplyExtrinsic(7),
event: SysEvent::ExtrinsicFailed {
dispatch_error: DispatchError::BadOrigin.into(),
dispatch_info: DispatchInfo { weight: 999, ..Default::default() },
@@ -268,6 +344,45 @@ fn deposit_event_uses_actual_weight() {
.into(),
topics: vec![]
},
EventRecord {
phase: Phase::ApplyExtrinsic(8),
event: SysEvent::ExtrinsicFailed {
dispatch_error: DispatchError::BadOrigin.into(),
dispatch_info: DispatchInfo {
weight: 1000,
pays_fee: Pays::Yes,
..Default::default()
},
}
.into(),
topics: vec![]
},
EventRecord {
phase: Phase::ApplyExtrinsic(9),
event: SysEvent::ExtrinsicFailed {
dispatch_error: DispatchError::BadOrigin.into(),
dispatch_info: DispatchInfo {
weight: 800,
pays_fee: Pays::Yes,
..Default::default()
},
}
.into(),
topics: vec![]
},
EventRecord {
phase: Phase::ApplyExtrinsic(10),
event: SysEvent::ExtrinsicFailed {
dispatch_error: DispatchError::BadOrigin.into(),
dispatch_info: DispatchInfo {
weight: 800,
pays_fee: Pays::No,
..Default::default()
},
}
.into(),
topics: vec![]
},
]
);
});