Skip to content

Commit 7b2c0e2

Browse files
authored
sudo_as should return a result (#7620)
1 parent 3076287 commit 7b2c0e2

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/lib.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,9 @@ decl_module! {
214214

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

217-
let res = match call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into()) {
218-
Ok(_) => true,
219-
Err(e) => {
220-
sp_runtime::print(e);
221-
false
222-
}
223-
};
217+
let res = call.dispatch_bypass_filter(frame_system::RawOrigin::Signed(who).into());
224218

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

src/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ fn sudo_as_emits_events_correctly() {
163163
// A non-privileged function will work when passed to `sudo_as` with the root `key`.
164164
let call = Box::new(Call::Logger(LoggerCall::non_privileged_log(42, 1)));
165165
assert_ok!(Sudo::sudo_as(Origin::signed(1), 2, call));
166-
let expected_event = TestEvent::sudo(RawEvent::SudoAsDone(true));
166+
let expected_event = TestEvent::sudo(RawEvent::SudoAsDone(Ok(())));
167167
assert!(System::events().iter().any(|a| a.event == expected_event));
168168
});
169169
}

0 commit comments

Comments
 (0)