From 291210aa0fafa97d9b924fe82d68c023bdb0a340 Mon Sep 17 00:00:00 2001
From: Jun Jiang <jasl9187@hotmail.com>
Date: Mon, 15 Jul 2024 18:45:49 +0800
Subject: [PATCH] Use sp_runtime::traits::BadOrigin (#5011)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It says `Will be removed after July 2023` but that's not true 😃
---------
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Bastian Köcher <git@kchr.de>
---
.../pallets/collective-content/src/tests.rs | 3 +-
.../runtime/common/src/paras_registrar/mod.rs | 6 ++--
.../src/assigner_on_demand/tests.rs | 3 +-
polkadot/runtime/parachains/src/hrmp/tests.rs | 3 +-
prdoc/pr_5011.prdoc | 29 +++++++++++++++++++
substrate/frame/alliance/src/tests.rs | 3 +-
substrate/frame/contracts/src/lib.rs | 3 +-
substrate/frame/democracy/src/lib.rs | 3 +-
substrate/frame/nomination-pools/src/lib.rs | 2 +-
.../frame/ranked-collective/src/tests.rs | 6 ++--
substrate/frame/utility/src/tests.rs | 3 +-
11 files changed, 45 insertions(+), 19 deletions(-)
create mode 100644 prdoc/pr_5011.prdoc
diff --git a/cumulus/parachains/pallets/collective-content/src/tests.rs b/cumulus/parachains/pallets/collective-content/src/tests.rs
index 4910b30b89a..7fee5eea101 100644
--- a/cumulus/parachains/pallets/collective-content/src/tests.rs
+++ b/cumulus/parachains/pallets/collective-content/src/tests.rs
@@ -16,7 +16,8 @@
//! Tests.
use super::{mock::*, *};
-use frame_support::{assert_noop, assert_ok, error::BadOrigin, pallet_prelude::Pays};
+use frame_support::{assert_noop, assert_ok, pallet_prelude::Pays};
+use sp_runtime::traits::BadOrigin;
/// returns CID hash of 68 bytes of given `i`.
fn create_cid(i: u8) -> OpaqueCid {
diff --git a/polkadot/runtime/common/src/paras_registrar/mod.rs b/polkadot/runtime/common/src/paras_registrar/mod.rs
index 6b9191f7c6f..606883b7119 100644
--- a/polkadot/runtime/common/src/paras_registrar/mod.rs
+++ b/polkadot/runtime/common/src/paras_registrar/mod.rs
@@ -718,9 +718,7 @@ mod tests {
mock::conclude_pvf_checking, paras_registrar, traits::Registrar as RegistrarTrait,
};
use frame_support::{
- assert_noop, assert_ok, derive_impl,
- error::BadOrigin,
- parameter_types,
+ assert_noop, assert_ok, derive_impl, parameter_types,
traits::{OnFinalize, OnInitialize},
};
use frame_system::limits;
@@ -731,7 +729,7 @@ mod tests {
use sp_io::TestExternalities;
use sp_keyring::Sr25519Keyring;
use sp_runtime::{
- traits::{BlakeTwo256, IdentityLookup},
+ traits::{BadOrigin, BlakeTwo256, IdentityLookup},
transaction_validity::TransactionPriority,
BuildStorage, Perbill,
};
diff --git a/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs b/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs
index 3d01ba655d3..a6074b305b4 100644
--- a/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs
+++ b/polkadot/runtime/parachains/src/assigner_on_demand/tests.rs
@@ -30,11 +30,12 @@ use crate::{
},
paras::{ParaGenesisArgs, ParaKind},
};
-use frame_support::{assert_noop, assert_ok, error::BadOrigin};
+use frame_support::{assert_noop, assert_ok};
use pallet_balances::Error as BalancesError;
use polkadot_primitives::{
BlockNumber, SessionIndex, ValidationCode, ON_DEMAND_MAX_QUEUE_MAX_SIZE,
};
+use sp_runtime::traits::BadOrigin;
use sp_std::{
cmp::{Ord, Ordering},
collections::btree_map::BTreeMap,
diff --git a/polkadot/runtime/parachains/src/hrmp/tests.rs b/polkadot/runtime/parachains/src/hrmp/tests.rs
index 4fcbc69e98a..52db932c796 100644
--- a/polkadot/runtime/parachains/src/hrmp/tests.rs
+++ b/polkadot/runtime/parachains/src/hrmp/tests.rs
@@ -27,8 +27,9 @@ use crate::{
},
shared,
};
-use frame_support::{assert_noop, assert_ok, error::BadOrigin};
+use frame_support::{assert_noop, assert_ok};
use polkadot_primitives::{BlockNumber, InboundDownwardMessage};
+use sp_runtime::traits::BadOrigin;
use std::collections::BTreeMap;
pub(crate) fn run_to_block(to: BlockNumber, new_session: Option<Vec<BlockNumber>>) {
diff --git a/prdoc/pr_5011.prdoc b/prdoc/pr_5011.prdoc
new file mode 100644
index 00000000000..cb827bae6c5
--- /dev/null
+++ b/prdoc/pr_5011.prdoc
@@ -0,0 +1,29 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "Use `BadOrigin` from `sp_runtime`"
+
+doc:
+ - audience: Runtime Dev
+ description: |
+ This PR refactor usages of deprecated `frame_support::error::BadOrigin` to `sp_runtime::traits::BadOrigin`
+
+crates:
+- name: pallet-collective-content
+ bump: patch
+- name: polkadot-runtime-common
+ bump: patch
+- name: polkadot-runtime-parachains
+ bump: patch
+- name: pallet-alliance
+ bump: patch
+- name: pallet-contracts
+ bump: patch
+- name: pallet-democracy
+ bump: patch
+- name: pallet-nomination-pools
+ bump: patch
+- name: pallet-ranked-collective
+ bump: patch
+- name: pallet-utility
+ bump: patch
diff --git a/substrate/frame/alliance/src/tests.rs b/substrate/frame/alliance/src/tests.rs
index edb515b8115..ec31ebf6a47 100644
--- a/substrate/frame/alliance/src/tests.rs
+++ b/substrate/frame/alliance/src/tests.rs
@@ -17,8 +17,9 @@
//! Tests for the alliance pallet.
-use frame_support::{assert_noop, assert_ok, error::BadOrigin};
+use frame_support::{assert_noop, assert_ok};
use frame_system::{EventRecord, Phase};
+use sp_runtime::traits::BadOrigin;
use super::*;
use crate::{self as alliance, mock::*};
diff --git a/substrate/frame/contracts/src/lib.rs b/substrate/frame/contracts/src/lib.rs
index 47772e0a5a0..33083c7ebe7 100644
--- a/substrate/frame/contracts/src/lib.rs
+++ b/substrate/frame/contracts/src/lib.rs
@@ -119,7 +119,6 @@ use environmental::*;
use frame_support::{
dispatch::{GetDispatchInfo, Pays, PostDispatchInfo, RawOrigin, WithPostDispatchInfo},
ensure,
- error::BadOrigin,
traits::{
fungible::{Inspect, Mutate, MutateHold},
ConstU32, Contains, Get, Randomness, Time,
@@ -135,7 +134,7 @@ use frame_system::{
use scale_info::TypeInfo;
use smallvec::Array;
use sp_runtime::{
- traits::{Convert, Dispatchable, Saturating, StaticLookup, Zero},
+ traits::{BadOrigin, Convert, Dispatchable, Saturating, StaticLookup, Zero},
DispatchError, RuntimeDebug,
};
use sp_std::{fmt::Debug, prelude::*};
diff --git a/substrate/frame/democracy/src/lib.rs b/substrate/frame/democracy/src/lib.rs
index 19cdc754659..e3b4696f8b2 100644
--- a/substrate/frame/democracy/src/lib.rs
+++ b/substrate/frame/democracy/src/lib.rs
@@ -155,7 +155,6 @@
use codec::{Decode, Encode};
use frame_support::{
ensure,
- error::BadOrigin,
traits::{
defensive_prelude::*,
schedule::{v3::Named as ScheduleNamed, DispatchTime},
@@ -166,7 +165,7 @@ use frame_support::{
};
use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
use sp_runtime::{
- traits::{Bounded as ArithBounded, One, Saturating, StaticLookup, Zero},
+ traits::{BadOrigin, Bounded as ArithBounded, One, Saturating, StaticLookup, Zero},
ArithmeticError, DispatchError, DispatchResult,
};
use sp_std::prelude::*;
diff --git a/substrate/frame/nomination-pools/src/lib.rs b/substrate/frame/nomination-pools/src/lib.rs
index 2b5fe8b6041..641f2b14577 100644
--- a/substrate/frame/nomination-pools/src/lib.rs
+++ b/substrate/frame/nomination-pools/src/lib.rs
@@ -2600,7 +2600,7 @@ pub mod pallet {
) -> DispatchResult {
let mut bonded_pool = match ensure_root(origin.clone()) {
Ok(()) => BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?,
- Err(frame_support::error::BadOrigin) => {
+ Err(sp_runtime::traits::BadOrigin) => {
let who = ensure_signed(origin)?;
let bonded_pool =
BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
diff --git a/substrate/frame/ranked-collective/src/tests.rs b/substrate/frame/ranked-collective/src/tests.rs
index a7827bcc1aa..3a85928b76d 100644
--- a/substrate/frame/ranked-collective/src/tests.rs
+++ b/substrate/frame/ranked-collective/src/tests.rs
@@ -20,14 +20,12 @@
use std::collections::BTreeMap;
use frame_support::{
- assert_noop, assert_ok, derive_impl,
- error::BadOrigin,
- parameter_types,
+ assert_noop, assert_ok, derive_impl, parameter_types,
traits::{ConstU16, EitherOf, MapSuccess, Polling},
};
use sp_core::Get;
use sp_runtime::{
- traits::{MaybeConvert, ReduceBy, ReplaceWithDefault},
+ traits::{BadOrigin, MaybeConvert, ReduceBy, ReplaceWithDefault},
BuildStorage,
};
diff --git a/substrate/frame/utility/src/tests.rs b/substrate/frame/utility/src/tests.rs
index eb2047aac28..0a58a92b4c9 100644
--- a/substrate/frame/utility/src/tests.rs
+++ b/substrate/frame/utility/src/tests.rs
@@ -25,14 +25,13 @@ use crate as utility;
use frame_support::{
assert_err_ignore_postinfo, assert_noop, assert_ok, derive_impl,
dispatch::{DispatchErrorWithPostInfo, Pays},
- error::BadOrigin,
parameter_types, storage,
traits::{ConstU64, Contains},
weights::Weight,
};
use pallet_collective::{EnsureProportionAtLeast, Instance1};
use sp_runtime::{
- traits::{BlakeTwo256, Dispatchable, Hash},
+ traits::{BadOrigin, BlakeTwo256, Dispatchable, Hash},
BuildStorage, DispatchError, TokenError,
};
--
GitLab