From 57e6b21935075adc16f04cc8319fb0ca5cc37db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sun, 4 Jun 2023 23:15:16 +0200
Subject: [PATCH] frame_system::remark: Allow any kind of origin (#14260)
* frame_system::remark: Allow any kind of origin
There should be no downside in allowing any kind of origin for `remark`.
* Fix tests
---
substrate/frame/alliance/src/tests.rs | 2 +-
substrate/frame/collective/src/benchmarking.rs | 8 ++++----
substrate/frame/system/src/lib.rs | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/substrate/frame/alliance/src/tests.rs b/substrate/frame/alliance/src/tests.rs
index de7cda4710f..098fd86bbae 100644
--- a/substrate/frame/alliance/src/tests.rs
+++ b/substrate/frame/alliance/src/tests.rs
@@ -299,7 +299,7 @@ fn close_works() {
})),
record(mock::RuntimeEvent::AllianceMotion(AllianceMotionEvent::Executed {
proposal_hash: hash,
- result: Err(DispatchError::BadOrigin),
+ result: Ok(()),
}))
]
);
diff --git a/substrate/frame/collective/src/benchmarking.rs b/substrate/frame/collective/src/benchmarking.rs
index bcd203c3894..8a4495ef409 100644
--- a/substrate/frame/collective/src/benchmarking.rs
+++ b/substrate/frame/collective/src/benchmarking.rs
@@ -131,7 +131,7 @@ benchmarks_instance_pallet! {
let proposal_hash = T::Hashing::hash_of(&proposal);
// Note that execution fails due to mis-matched origin
assert_last_event::<T, I>(
- Event::MemberExecuted { proposal_hash, result: Err(DispatchError::BadOrigin) }.into()
+ Event::MemberExecuted { proposal_hash, result: Ok(()) }.into()
);
}
@@ -162,7 +162,7 @@ benchmarks_instance_pallet! {
let proposal_hash = T::Hashing::hash_of(&proposal);
// Note that execution fails due to mis-matched origin
assert_last_event::<T, I>(
- Event::Executed { proposal_hash, result: Err(DispatchError::BadOrigin) }.into()
+ Event::Executed { proposal_hash, result: Ok(()) }.into()
);
}
@@ -441,7 +441,7 @@ benchmarks_instance_pallet! {
verify {
// The last proposal is removed.
assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
- assert_last_event::<T, I>(Event::Executed { proposal_hash: last_hash, result: Err(DispatchError::BadOrigin) }.into());
+ assert_last_event::<T, I>(Event::Executed { proposal_hash: last_hash, result: Ok(()) }.into());
}
close_disapproved {
@@ -595,7 +595,7 @@ benchmarks_instance_pallet! {
}: close(SystemOrigin::Signed(caller), last_hash, p - 1, Weight::MAX, bytes_in_storage)
verify {
assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
- assert_last_event::<T, I>(Event::Executed { proposal_hash: last_hash, result: Err(DispatchError::BadOrigin) }.into());
+ assert_last_event::<T, I>(Event::Executed { proposal_hash: last_hash, result: Ok(()) }.into());
}
disapprove_proposal {
diff --git a/substrate/frame/system/src/lib.rs b/substrate/frame/system/src/lib.rs
index 79cdcf22f55..a48a1e459f3 100644
--- a/substrate/frame/system/src/lib.rs
+++ b/substrate/frame/system/src/lib.rs
@@ -414,11 +414,10 @@ pub mod pallet {
impl<T: Config> Pallet<T> {
/// Make some on-chain remark.
///
- /// - `O(1)`
+ /// Can be executed by every `origin`.
#[pallet::call_index(0)]
#[pallet::weight(T::SystemWeightInfo::remark(_remark.len() as u32))]
- pub fn remark(origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo {
- ensure_signed_or_root(origin)?;
+ pub fn remark(_origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo {
Ok(().into())
}
--
GitLab