Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Add field names to pallet Event variants #10184

Merged
paritytech-processbot merged 9 commits into from
Nov 15, 2021
Merged

Add field names to pallet Event variants #10184

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26cfa94
Changed named fields to struct variants
ayevbeosa Nov 3, 2021
2e1911f
Merged from master branch
ayevbeosa Nov 3, 2021
e92d3a0
Fixed errors.
ayevbeosa Nov 4, 2021
2313995
Made adjustments as per `cargo +nightly fmt`.
ayevbeosa Nov 5, 2021
d04680d
Update frame/uniques/src/lib.rs
ayevbeosa Nov 5, 2021
67ba77d
Merge branch 'master' of https://github.com/paritytech/substrate into…
ayevbeosa Nov 5, 2021
49d25ed
Removed redundant comments for structs.
ayevbeosa Nov 5, 2021
48c4b5f
Moved frame-support to dev dependencies
ayevbeosa Nov 5, 2021
122b2b7
Merge branch 'master' of https://github.com/paritytech/substrate into…
ayevbeosa Nov 15, 2021
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
Prev Previous commit
Next Next commit
Fixed errors.
  • Loading branch information
@ayevbeosa
ayevbeosa committed Nov 4, 2021
commit e92d3a0481d8d871914b722b74ec9e3b3cc1d0ca
8 changes: 4 additions & 4 deletions frame/contracts/src/exec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2157,10 +2157,10 @@ mod tests {
},
EventRecord {
phase: Phase::Initialization,
event: MetaEvent::Utility(pallet_utility::Event::BatchInterrupted(
1,
frame_system::Error::<Test>::CallFiltered.into()
),),
event: MetaEvent::Utility(pallet_utility::Event::BatchInterrupted {
index: 1,
error: frame_system::Error:: < Test>::CallFiltered.into()
},),
topics: vec![],
},
]
Expand Down
4 changes: 2 additions & 2 deletions frame/proxy/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ fn filtering_works() {
);
assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
expect_events(vec![
UtilityEvent::BatchInterrupted(0, SystemError::CallFiltered.into()).into(),
UtilityEvent::BatchInterrupted { index: 0, error: SystemError::CallFiltered.into() }.into(),
ProxyEvent::ProxyExecuted(Ok(())).into(),
]);

Expand All @@ -386,7 +386,7 @@ fn filtering_works() {
);
assert_ok!(Proxy::proxy(Origin::signed(4), 1, None, call.clone()));
expect_events(vec![
UtilityEvent::BatchInterrupted(0, SystemError::CallFiltered.into()).into(),
UtilityEvent::BatchInterrupted { index: 0, error: SystemError::CallFiltered.into() }.into(),
ProxyEvent::ProxyExecuted(Ok(())).into(),
]);

Expand Down
10 changes: 5 additions & 5 deletions frame/utility/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ fn batch_with_signed_filters() {
vec![Call::Balances(pallet_balances::Call::transfer_keep_alive { dest: 2, value: 1 })]
),);
System::assert_last_event(
utility::Event::BatchInterrupted(0, frame_system::Error::<Test>::CallFiltered.into())
utility::Event::BatchInterrupted { index: 0, error: frame_system::Error:: < Test>::CallFiltered.into() }
.into(),
);
});
Expand Down Expand Up @@ -410,7 +410,7 @@ fn batch_handles_weight_refund() {
let result = call.dispatch(Origin::signed(1));
assert_ok!(result);
System::assert_last_event(
utility::Event::BatchInterrupted(1, DispatchError::Other("")).into(),
utility::Event::BatchInterrupted { index: 1, error: DispatchError::Other("") }.into(),
);
// No weight is refunded
assert_eq!(extract_actual_weight(&result, &info), info.weight);
Expand All @@ -425,7 +425,7 @@ fn batch_handles_weight_refund() {
let result = call.dispatch(Origin::signed(1));
assert_ok!(result);
System::assert_last_event(
utility::Event::BatchInterrupted(1, DispatchError::Other("")).into(),
utility::Event::BatchInterrupted { index: 1, error: DispatchError::Other("") }.into(),
);
assert_eq!(extract_actual_weight(&result, &info), info.weight - diff * batch_len);

Expand All @@ -438,7 +438,7 @@ fn batch_handles_weight_refund() {
let result = call.dispatch(Origin::signed(1));
assert_ok!(result);
System::assert_last_event(
utility::Event::BatchInterrupted(1, DispatchError::Other("")).into(),
utility::Event::BatchInterrupted { index: 1, error: DispatchError::Other("") }.into(),
);
assert_eq!(
extract_actual_weight(&result, &info),
Expand Down Expand Up @@ -586,7 +586,7 @@ fn batch_all_does_not_nest() {
// and balances.
assert_ok!(Utility::batch_all(Origin::signed(1), vec![batch_nested]));
System::assert_has_event(
utility::Event::BatchInterrupted(0, frame_system::Error::<Test>::CallFiltered.into())
utility::Event::BatchInterrupted { index: 0, error: frame_system::Error:: < Test>::CallFiltered.into() }
.into(),
);
assert_eq!(Balances::free_balance(1), 10);
Expand Down