mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-14 09:51:10 +00:00
BREAKING: Rename Call & Event (#11981)
* rename Event to RuntimeEvent * rename Call * rename in runtimes * small fix * rename Event * small fix & rename RuntimeCall back to Call for now * small fixes * more renaming * a bit more renaming * fmt * small fix * commit * prep for renaming associated types * fix * rename associated Event type * rename to RuntimeEvent * commit * merge conflict fixes & fmt * additional renaming * fix. * fix decl_event * rename in tests * remove warnings * remove accidental rename * . * commit * update .stderr * fix in test * update .stderr * TRYBUILD=overwrite * docs * fmt * small change in docs * rename PalletEvent to Event * rename Call to RuntimeCall * renamed at wrong places :P * rename Call * rename * rename associated type * fix * fix & fmt * commit * frame-support-test * passing tests * update docs * rustdoc fix * update .stderr * wrong code in docs * merge fix * fix in error message * update .stderr * docs & error message * . * merge fix * merge fix * fmt * fmt * merge fix * more fixing * fmt * remove unused * fmt * fix Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
@@ -42,7 +42,7 @@ fn setup_multi<T: Config>(
|
||||
}
|
||||
signatories.sort();
|
||||
// Must first convert to outer call type.
|
||||
let call: <T as Config>::Call =
|
||||
let call: <T as Config>::RuntimeCall =
|
||||
frame_system::Call::<T>::remark { remark: vec![0; z as usize] }.into();
|
||||
let call_data = OpaqueCall::<T>::from_encoded(call.encode());
|
||||
Ok((signatories, call_data))
|
||||
@@ -54,7 +54,7 @@ benchmarks! {
|
||||
let z in 0 .. 10_000;
|
||||
let max_signatories = T::MaxSignatories::get().into();
|
||||
let (mut signatories, _) = setup_multi::<T>(max_signatories, z)?;
|
||||
let call: <T as Config>::Call = frame_system::Call::<T>::remark {
|
||||
let call: <T as Config>::RuntimeCall = frame_system::Call::<T>::remark {
|
||||
remark: vec![0; z as usize]
|
||||
}.into();
|
||||
let call_hash = call.using_encoded(blake2_256);
|
||||
|
||||
@@ -99,7 +99,7 @@ pub struct Multisig<BlockNumber, Balance, AccountId> {
|
||||
approvals: Vec<AccountId>,
|
||||
}
|
||||
|
||||
type OpaqueCall<T> = WrapperKeepOpaque<<T as Config>::Call>;
|
||||
type OpaqueCall<T> = WrapperKeepOpaque<<T as Config>::RuntimeCall>;
|
||||
|
||||
type CallHash = [u8; 32];
|
||||
|
||||
@@ -117,10 +117,10 @@ pub mod pallet {
|
||||
#[pallet::config]
|
||||
pub trait Config: frame_system::Config {
|
||||
/// The overarching event type.
|
||||
type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
|
||||
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
|
||||
|
||||
/// The overarching call type.
|
||||
type Call: Parameter
|
||||
type RuntimeCall: Parameter
|
||||
+ Dispatchable<Origin = Self::Origin, PostInfo = PostDispatchInfo>
|
||||
+ GetDispatchInfo
|
||||
+ From<frame_system::Call<Self>>;
|
||||
@@ -266,7 +266,7 @@ pub mod pallet {
|
||||
pub fn as_multi_threshold_1(
|
||||
origin: OriginFor<T>,
|
||||
other_signatories: Vec<T::AccountId>,
|
||||
call: Box<<T as Config>::Call>,
|
||||
call: Box<<T as Config>::RuntimeCall>,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
let who = ensure_signed(origin)?;
|
||||
let max_sigs = T::MaxSignatories::get() as usize;
|
||||
@@ -698,7 +698,7 @@ impl<T: Config> Pallet<T> {
|
||||
fn get_call(
|
||||
hash: &[u8; 32],
|
||||
maybe_known: Option<&OpaqueCall<T>>,
|
||||
) -> Option<(<T as Config>::Call, usize)> {
|
||||
) -> Option<(<T as Config>::RuntimeCall, usize)> {
|
||||
maybe_known.map_or_else(
|
||||
|| {
|
||||
Calls::<T>::get(hash)
|
||||
|
||||
@@ -61,12 +61,12 @@ impl frame_system::Config for Test {
|
||||
type Index = u64;
|
||||
type BlockNumber = u64;
|
||||
type Hash = H256;
|
||||
type Call = Call;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Hashing = BlakeTwo256;
|
||||
type AccountId = u64;
|
||||
type Lookup = IdentityLookup<Self::AccountId>;
|
||||
type Header = Header;
|
||||
type Event = Event;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type BlockHashCount = ConstU64<250>;
|
||||
type Version = ();
|
||||
type PalletInfo = PalletInfo;
|
||||
@@ -84,7 +84,7 @@ impl pallet_balances::Config for Test {
|
||||
type MaxReserves = ();
|
||||
type ReserveIdentifier = [u8; 8];
|
||||
type Balance = u64;
|
||||
type Event = Event;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type DustRemoval = ();
|
||||
type ExistentialDeposit = ConstU64<1>;
|
||||
type AccountStore = System;
|
||||
@@ -92,19 +92,19 @@ impl pallet_balances::Config for Test {
|
||||
}
|
||||
|
||||
pub struct TestBaseCallFilter;
|
||||
impl Contains<Call> for TestBaseCallFilter {
|
||||
fn contains(c: &Call) -> bool {
|
||||
impl Contains<RuntimeCall> for TestBaseCallFilter {
|
||||
fn contains(c: &RuntimeCall) -> bool {
|
||||
match *c {
|
||||
Call::Balances(_) => true,
|
||||
RuntimeCall::Balances(_) => true,
|
||||
// Needed for benchmarking
|
||||
Call::System(frame_system::Call::remark { .. }) => true,
|
||||
RuntimeCall::System(frame_system::Call::remark { .. }) => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
}
|
||||
impl Config for Test {
|
||||
type Event = Event;
|
||||
type Call = Call;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type RuntimeCall = RuntimeCall;
|
||||
type Currency = Balances;
|
||||
type DepositBase = ConstU64<1>;
|
||||
type DepositFactor = ConstU64<1>;
|
||||
@@ -130,8 +130,8 @@ fn now() -> Timepoint<u64> {
|
||||
Multisig::timepoint()
|
||||
}
|
||||
|
||||
fn call_transfer(dest: u64, value: u64) -> Call {
|
||||
Call::Balances(BalancesCall::transfer { dest, value })
|
||||
fn call_transfer(dest: u64, value: u64) -> RuntimeCall {
|
||||
RuntimeCall::Balances(BalancesCall::transfer { dest, value })
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -850,7 +850,7 @@ fn multisig_1_of_3_works() {
|
||||
#[test]
|
||||
fn multisig_filters() {
|
||||
new_test_ext().execute_with(|| {
|
||||
let call = Box::new(Call::System(frame_system::Call::set_code { code: vec![] }));
|
||||
let call = Box::new(RuntimeCall::System(frame_system::Call::set_code { code: vec![] }));
|
||||
assert_noop!(
|
||||
Multisig::as_multi_threshold_1(Origin::signed(1), vec![2], call.clone()),
|
||||
DispatchError::from(frame_system::Error::<Test>::CallFiltered),
|
||||
|
||||
Reference in New Issue
Block a user