mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 16:17:59 +00:00
Bastian Köcher
8e393aa5a8
* Make `decl_error!` errors usable This pr implements support for returning errors of different pallets in a pallet. These errors need to be declared with `decl_error!`. The pr changes the following: - Each dispatchable function now returns a `DispatchResult` which is an alias for `Result<(), DispatchError>`. - `DispatchError` is an enum that has 4 variants: - `Other`: For storing string error messages - `CannotLookup`: Variant that is returned when something returns a `sp_runtime::LookupError` - `BadOrigin`: Variant that is returned for any kind of bad origin - `Module`: The error of a specific module. Contains the `index`, `error` and the `message`. The index is the index of the module in `construct_runtime!`. `error` is the index of the error in the error enum declared by `decl_error!`. `message` is the message to the error variant (this will not be encoded). - `construct_runtime!` now creates a new struct `ModuleToIndex`. This struct implements the trait `ModuleToIndex`. - `frame_system::Trait` has a new associated type: `ModuleToIndex` that expects the `ModuleToIndex` generated by `construct_runtime!`. - All error strings returned in any module are being converted now to `DispatchError`. - `BadOrigin` is the default error returned by any type that implements `EnsureOrigin`. * Fix frame system benchmarks
66 lines
1.5 KiB
Rust
66 lines
1.5 KiB
Rust
use frame_support::codec::{Encode, Decode, EncodeLike};
|
|
|
|
pub trait Trait: 'static + Eq + Clone {
|
|
type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
|
|
+ From<RawOrigin<Self::AccountId>>;
|
|
|
|
type BlockNumber: Decode + Encode + EncodeLike + Clone + Default;
|
|
type Hash;
|
|
type AccountId: Encode + EncodeLike + Decode;
|
|
type Event: From<Event>;
|
|
type ModuleToIndex: frame_support::traits::ModuleToIndex;
|
|
}
|
|
|
|
frame_support::decl_module! {
|
|
pub struct Module<T: Trait> for enum Call where origin: T::Origin {
|
|
}
|
|
}
|
|
|
|
impl<T: Trait> Module<T> {
|
|
pub fn deposit_event(_event: impl Into<T::Event>) {
|
|
}
|
|
}
|
|
|
|
frame_support::decl_event!(
|
|
pub enum Event {
|
|
ExtrinsicSuccess,
|
|
ExtrinsicFailed,
|
|
}
|
|
);
|
|
|
|
frame_support::decl_error! {
|
|
pub enum Error for Module<T: Trait> {
|
|
/// Test error documentation
|
|
TestError,
|
|
/// Error documentation
|
|
/// with multiple lines
|
|
AnotherError
|
|
}
|
|
}
|
|
|
|
/// Origin for the system module.
|
|
#[derive(PartialEq, Eq, Clone, sp_runtime::RuntimeDebug)]
|
|
pub enum RawOrigin<AccountId> {
|
|
Root,
|
|
Signed(AccountId),
|
|
None,
|
|
}
|
|
|
|
impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
|
|
fn from(s: Option<AccountId>) -> RawOrigin<AccountId> {
|
|
match s {
|
|
Some(who) => RawOrigin::Signed(who),
|
|
None => RawOrigin::None,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
|
|
|
|
#[allow(dead_code)]
|
|
pub fn ensure_root<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), &'static str>
|
|
where OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>
|
|
{
|
|
o.into().map(|_| ()).map_err(|_| "bad origin: expected to be a root origin")
|
|
}
|