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

sudo_as Returns a Result #7620

Merged
merged 1 commit into from
Nov 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 9 deletions frame/sudo/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,9 @@ decl_module! {

let who = T::Lookup::lookup(who)?;

let res = match call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into()) {
Ok(_) => true,
Err(e) => {
sp_runtime::print(e);
false
}
};
let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into());

Self::deposit_event(RawEvent::SudoAsDone(res));
Self::deposit_event(RawEvent::SudoAsDone(res.map(|_| ()).map_err(|e| e.error)));
// Sudo user does not pay a fee.
Ok(Pays::No.into())
}
Expand All @@ -236,7 +230,7 @@ decl_event!(
/// The \[sudoer\] just switched identity; the old key is supplied.
KeyChanged(AccountId),
/// A sudo just took place. \[result\]
SudoAsDone(bool),
SudoAsDone(DispatchResult),
}
);

Expand Down
2 changes: 1 addition & 1 deletion frame/sudo/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ fn sudo_as_emits_events_correctly() {
// A non-privileged function will work when passed to `sudo_as` with the root `key`.
let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
let expected_event = TestEvent::sudo(RawEvent::SudoAsDone(true));
let expected_event = TestEvent::sudo(RawEvent::SudoAsDone(Ok(())));
assert!(System::events().iter().any(|a| a.event == expected_event));
});
}