Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit a5c2ead

Browse files
SzegooSzegoo
committed
more fixes
1 parent 6e107bc commit a5c2ead

File tree

17 files changed

+39
-39
lines changed

17 files changed

+39
-39
lines changed

‎runtime/common/src/integration_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn account_id(i: u32) -> AccountId32 {
6161
array.into()
6262
}
6363

64-
fn signed(i: u32) -> RuntimeOrigin {
64+
fn signed(i: u32) -> Origin {
6565
let account_id = account_id(i);
6666
RuntimeOrigin::signed(account_id)
6767
}

‎runtime/common/src/paras_registrar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ mod tests {
801801
ValidationCode(validation_code)
802802
}
803803

804-
fn para_origin(id: ParaId) -> RuntimeOrigin {
804+
fn para_origin(id: ParaId) -> Origin {
805805
runtime_parachains::Origin::Parachain(id).into()
806806
}
807807

‎runtime/kusama/src/xcm_config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! XCM configurations for the Kusama runtime.
1818
1919
use super::{
20-
parachains_origin, AccountId, Balances, CouncilCollective, Origin, ParaId, Runtime,
20+
parachains_origin, AccountId, Balances, CouncilCollective, RuntimeOrigin, ParaId, Runtime,
2121
RuntimeCall, RuntimeEvent, WeightToFee, XcmPallet,
2222
};
2323
use frame_support::{match_types, parameter_types, traits::Everything};
@@ -158,7 +158,7 @@ parameter_types! {
158158

159159
/// Type to convert the council origin to a Plurality `MultiLocation` value.
160160
pub type CouncilToPlurality = BackingToPlurality<
161-
Origin,
161+
RuntimeOrigin,
162162
pallet_collective::Origin<Runtime, CouncilCollective>,
163163
CouncilBodyId,
164164
>;

‎runtime/parachains/src/configuration/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
1616

1717
use super::*;
18-
use crate::mock::{new_test_ext, Configuration, Origin, ParasShared, Test};
18+
use crate::mock::{new_test_ext, Configuration, RuntimeOrigin, ParasShared, Test};
1919
use frame_support::{assert_err, assert_ok};
2020

2121
fn on_new_session(session_index: SessionIndex) -> (HostConfiguration<u32>, HostConfiguration<u32>) {

‎runtime/parachains/src/hrmp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ pub mod pallet {
241241
/// The outer event type.
242242
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
243243

244-
type RuntimeOrigin: From<crate::RuntimeOrigin>
244+
type RuntimeOrigin: From<crate::Origin>
245245
+ From<<Self as frame_system::Config>::RuntimeOrigin>
246246
+ Into<Result<crate::Origin, <Self as Config>::RuntimeOrigin>>;
247247

‎runtime/parachains/src/hrmp/benchmarking.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ fn establish_para_connection<T: Config>(
6464
from: u32,
6565
to: u32,
6666
until: ParachainSetupStep,
67-
) -> [(ParaId, crate::RuntimeOrigin); 2]
67+
) -> [(ParaId, crate::Origin); 2]
6868
where
69-
<T as frame_system::Config>::RuntimeOrigin: From<crate::RuntimeOrigin>,
69+
<T as frame_system::Config>::RuntimeOrigin: From<crate::Origin>,
7070
{
7171
let config = Configuration::<T>::config();
7272
let deposit: BalanceOf<T> = config.hrmp_sender_deposit.unique_saturated_into();
@@ -138,7 +138,7 @@ static_assertions::const_assert!(HRMP_MAX_INBOUND_CHANNELS_BOUND < PREFIX_0);
138138
static_assertions::const_assert!(HRMP_MAX_OUTBOUND_CHANNELS_BOUND < PREFIX_0);
139139

140140
frame_benchmarking::benchmarks! {
141-
where_clause { where <T as frame_system::Config>::RuntimeOrigin: From<crate::RuntimeOrigin> }
141+
where_clause { where <T as frame_system::Config>::RuntimeOrigin: From<crate::Origin> }
142142

143143
hrmp_init_open_channel {
144144
let sender_id: ParaId = 1u32.into();

‎runtime/parachains/src/origin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ where
2929
OuterOrigin: Into<result::Result<Origin, OuterOrigin>>,
3030
{
3131
match o.into() {
32-
Ok(RuntimeOrigin::Parachain(id)) => Ok(id),
32+
Ok(Origin::Parachain(id)) => Ok(id),
3333
_ => Err(BadOrigin),
3434
}
3535
}
@@ -71,7 +71,7 @@ pub mod pallet {
7171
}
7272

7373
impl From<u32> for Origin {
74-
fn from(id: u32) -> RuntimeOrigin {
74+
fn from(id: u32) -> Origin {
7575
Origin::Parachain(id.into())
7676
}
7777
}

‎runtime/parachains/src/paras/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use test_helpers::{dummy_head_data, dummy_validation_code};
2626
use crate::{
2727
configuration::HostConfiguration,
2828
mock::{
29-
new_test_ext, Configuration, MockGenesisConfig, Origin, Paras, ParasShared, System, Test,
29+
new_test_ext, Configuration, MockGenesisConfig, RuntimeOrigin, Paras, ParasShared, System, Test,
3030
},
3131
};
3232

‎runtime/parachains/src/session_info/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::{
1919
configuration::HostConfiguration,
2020
initializer::SessionChangeNotification,
2121
mock::{
22-
new_test_ext, Configuration, MockGenesisConfig, Origin, ParasShared, SessionInfo, System,
22+
new_test_ext, Configuration, MockGenesisConfig, RuntimeOrigin, ParasShared, SessionInfo, System,
2323
Test,
2424
},
2525
util::take_active_subset,

‎runtime/parachains/src/ump/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
use super::*;
1818
use crate::mock::{
19-
assert_last_event, new_test_ext, take_processed, Configuration, MockGenesisConfig, Origin,
19+
assert_last_event, new_test_ext, take_processed, Configuration, MockGenesisConfig, RuntimeOrigin,
2020
System, Test, Ump,
2121
};
2222
use frame_support::{assert_noop, assert_ok, weights::Weight};

‎runtime/polkadot/src/xcm_config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! XCM configuration for Polkadot.
1818
1919
use super::{
20-
parachains_origin, AccountId, Balances, CouncilCollective, Origin, ParaId, Runtime,
20+
parachains_origin, AccountId, Balances, CouncilCollective, RuntimeOrigin, ParaId, Runtime,
2121
RuntimeCall, RuntimeEvent, WeightToFee, XcmPallet,
2222
};
2323
use frame_support::{
@@ -158,7 +158,7 @@ parameter_types! {
158158

159159
/// Type to convert a council origin to a Plurality `MultiLocation` value.
160160
pub type CouncilToPlurality = BackingToPlurality<
161-
Origin,
161+
RuntimeOrigin,
162162
pallet_collective::Origin<Runtime, CouncilCollective>,
163163
CouncilBodyId,
164164
>;

‎runtime/rococo/src/xcm_config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! XCM configuration for Rococo.
1818
1919
use super::{
20-
parachains_origin, AccountId, Balances, CouncilCollective, Origin, ParaId, Runtime,
20+
parachains_origin, AccountId, Balances, CouncilCollective, RuntimeOrigin, ParaId, Runtime,
2121
RuntimeCall, RuntimeEvent, WeightToFee, XcmPallet,
2222
};
2323
use frame_support::{match_types, parameter_types, traits::Everything};
@@ -176,7 +176,7 @@ parameter_types! {
176176

177177
/// Type to convert the council origin to a Plurality `MultiLocation` value.
178178
pub type CouncilToPlurality = BackingToPlurality<
179-
Origin,
179+
RuntimeOrigin,
180180
pallet_collective::Origin<Runtime, CouncilCollective>,
181181
CouncilBodyId,
182182
>;

‎runtime/westend/src/xcm_config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! XCM configurations for Westend.
1818
1919
use super::{
20-
parachains_origin, weights, AccountId, Balances, Origin, ParaId, Runtime, RuntimeCall,
20+
parachains_origin, weights, AccountId, Balances, RuntimeOrigin, ParaId, Runtime, RuntimeCall,
2121
RuntimeEvent, WeightToFee, XcmPallet,
2222
};
2323
use frame_support::{

‎xcm/pallet-xcm-benchmarks/src/generic/mock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ where
168168
fn convert_origin(
169169
_origin: impl Into<MultiLocation>,
170170
_kind: OriginKind,
171-
) -> Result<Origin, MultiLocation> {
171+
) -> Result<RuntimeOrigin, MultiLocation> {
172172
Ok(RuntimeOrigin::signed(
173173
<RuntimeOrigin as OriginTrait>::AccountId::decode(&mut TrailingZeroInput::zeroes())
174174
.expect("infinite length input; no invalid inputs for type; qed"),

‎xcm/pallet-xcm/src/lib.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ pub mod pallet {
229229
Response(MultiLocation),
230230
}
231231
impl From<MultiLocation> for Origin {
232-
fn from(location: MultiLocation) -> RuntimeOrigin {
232+
fn from(location: MultiLocation) -> Origin {
233233
Origin::Xcm(location)
234234
}
235235
}
@@ -1480,7 +1480,7 @@ where
14801480
OuterOrigin: Into<Result<Origin, OuterOrigin>>,
14811481
{
14821482
match o.into() {
1483-
Ok(RuntimeOrigin::Xcm(location)) => Ok(location),
1483+
Ok(Origin::Xcm(location)) => Ok(location),
14841484
_ => Err(BadOrigin),
14851485
}
14861486
}
@@ -1493,7 +1493,7 @@ where
14931493
OuterOrigin: Into<Result<Origin, OuterOrigin>>,
14941494
{
14951495
match o.into() {
1496-
Ok(RuntimeOrigin::Response(location)) => Ok(location),
1496+
Ok(Origin::Response(location)) => Ok(location),
14971497
_ => Err(BadOrigin),
14981498
}
14991499
}
@@ -1525,15 +1525,15 @@ where
15251525
outer.try_with_caller(|caller| {
15261526
caller.try_into().and_then(|o| match o {
15271527
Origin::Xcm(location) if F::contains(&location) => Ok(location),
1528-
Origin::Xcm(location) => Err(RuntimeOrigin::Xcm(location).into()),
1528+
Origin::Xcm(location) => Err(Origin::Xcm(location).into()),
15291529
o => Err(o.into()),
15301530
})
15311531
})
15321532
}
15331533

15341534
#[cfg(feature = "runtime-benchmarks")]
15351535
fn try_successful_origin() -> Result<O, ()> {
1536-
Ok(O::from(RuntimeOrigin::Xcm(Here.into())))
1536+
Ok(O::from(Origin::Xcm(Here.into())))
15371537
}
15381538
}
15391539

@@ -1558,20 +1558,20 @@ where
15581558

15591559
#[cfg(feature = "runtime-benchmarks")]
15601560
fn try_successful_origin() -> Result<O, ()> {
1561-
Ok(O::from(RuntimeOrigin::Response(Here.into())))
1561+
Ok(O::from(Origin::Response(Here.into())))
15621562
}
15631563
}
15641564

15651565
/// A simple passthrough where we reuse the `MultiLocation`-typed XCM origin as the inner value of
15661566
/// this crate's `Origin::Xcm` value.
15671567
pub struct XcmPassthrough<RuntimeOrigin>(PhantomData<RuntimeOrigin>);
1568-
impl<RuntimeOrigin: From<crate::RuntimeOrigin>> ConvertOrigin<RuntimeOrigin>
1568+
impl<RuntimeOrigin: From<crate::Origin>> ConvertOrigin<RuntimeOrigin>
15691569
for XcmPassthrough<RuntimeOrigin>
15701570
{
15711571
fn convert_origin(
15721572
origin: impl Into<MultiLocation>,
15731573
kind: OriginKind,
1574-
) -> Result<Origin, MultiLocation> {
1574+
) -> Result<RuntimeOrigin, MultiLocation> {
15751575
let origin = origin.into();
15761576
match kind {
15771577
OriginKind::Xcm => Ok(crate::Origin::Xcm(origin).into()),

‎xcm/xcm-builder/src/origin_conversion.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ where
3737
fn convert_origin(
3838
origin: impl Into<MultiLocation>,
3939
kind: OriginKind,
40-
) -> Result<Origin, MultiLocation> {
40+
) -> Result<RuntimeOrigin, MultiLocation> {
4141
let origin = origin.into();
4242
log::trace!(
4343
target: "xcm::origin_conversion",
@@ -58,7 +58,7 @@ impl<RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin> for ParentAsSuperu
5858
fn convert_origin(
5959
origin: impl Into<MultiLocation>,
6060
kind: OriginKind,
61-
) -> Result<Origin, MultiLocation> {
61+
) -> Result<RuntimeOrigin, MultiLocation> {
6262
let origin = origin.into();
6363
log::trace!(target: "xcm::origin_conversion", "ParentAsSuperuser origin: {:?}, kind: {:?}", origin, kind);
6464
if kind == OriginKind::Superuser && origin.contains_parents_only(1) {
@@ -78,7 +78,7 @@ impl<ParaId: IsSystem + From<u32>, RuntimeOrigin: OriginTrait> ConvertOrigin<Run
7878
fn convert_origin(
7979
origin: impl Into<MultiLocation>,
8080
kind: OriginKind,
81-
) -> Result<Origin, MultiLocation> {
81+
) -> Result<RuntimeOrigin, MultiLocation> {
8282
let origin = origin.into();
8383
log::trace!(target: "xcm::origin_conversion", "ChildSystemParachainAsSuperuser origin: {:?}, kind: {:?}", origin, kind);
8484
match (kind, origin) {
@@ -100,7 +100,7 @@ impl<ParaId: IsSystem + From<u32>, RuntimeOrigin: OriginTrait> ConvertOrigin<Run
100100
fn convert_origin(
101101
origin: impl Into<MultiLocation>,
102102
kind: OriginKind,
103-
) -> Result<Origin, MultiLocation> {
103+
) -> Result<RuntimeOrigin, MultiLocation> {
104104
let origin = origin.into();
105105
log::trace!(
106106
target: "xcm::origin_conversion",
@@ -126,7 +126,7 @@ impl<ParachainOrigin: From<u32>, RuntimeOrigin: From<ParachainOrigin>> ConvertOr
126126
fn convert_origin(
127127
origin: impl Into<MultiLocation>,
128128
kind: OriginKind,
129-
) -> Result<Origin, MultiLocation> {
129+
) -> Result<RuntimeOrigin, MultiLocation> {
130130
let origin = origin.into();
131131
log::trace!(target: "xcm::origin_conversion", "ChildParachainAsNative origin: {:?}, kind: {:?}", origin, kind);
132132
match (kind, origin) {
@@ -148,7 +148,7 @@ impl<ParachainOrigin: From<u32>, RuntimeOrigin: From<ParachainOrigin>> ConvertOr
148148
fn convert_origin(
149149
origin: impl Into<MultiLocation>,
150150
kind: OriginKind,
151-
) -> Result<Origin, MultiLocation> {
151+
) -> Result<RuntimeOrigin, MultiLocation> {
152152
let origin = origin.into();
153153
log::trace!(
154154
target: "xcm::origin_conversion",
@@ -175,7 +175,7 @@ impl<RelayOrigin: Get<RuntimeOrigin>, RuntimeOrigin> ConvertOrigin<RuntimeOrigin
175175
fn convert_origin(
176176
origin: impl Into<MultiLocation>,
177177
kind: OriginKind,
178-
) -> Result<Origin, MultiLocation> {
178+
) -> Result<RuntimeOrigin, MultiLocation> {
179179
let origin = origin.into();
180180
log::trace!(target: "xcm::origin_conversion", "RelayChainAsNative origin: {:?}, kind: {:?}", origin, kind);
181181
if kind == OriginKind::Native && origin.contains_parents_only(1) {
@@ -195,7 +195,7 @@ where
195195
fn convert_origin(
196196
origin: impl Into<MultiLocation>,
197197
kind: OriginKind,
198-
) -> Result<Origin, MultiLocation> {
198+
) -> Result<RuntimeOrigin, MultiLocation> {
199199
let origin = origin.into();
200200
log::trace!(
201201
target: "xcm::origin_conversion",
@@ -224,7 +224,7 @@ where
224224
fn convert_origin(
225225
origin: impl Into<MultiLocation>,
226226
kind: OriginKind,
227-
) -> Result<Origin, MultiLocation> {
227+
) -> Result<RuntimeOrigin, MultiLocation> {
228228
let origin = origin.into();
229229
log::trace!(
230230
target: "xcm::origin_conversion",
@@ -265,7 +265,7 @@ where
265265
}
266266

267267
#[cfg(feature = "runtime-benchmarks")]
268-
fn try_successful_origin() -> Result<Origin, ()> {
268+
fn try_successful_origin() -> Result<RuntimeOrigin, ()> {
269269
Ok(RuntimeOrigin::root())
270270
}
271271
}

‎xcm/xcm-executor/src/traits/conversion.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ pub trait ConvertOrigin<RuntimeOrigin> {
178178
fn convert_origin(
179179
origin: impl Into<MultiLocation>,
180180
kind: OriginKind,
181-
) -> Result<Origin, MultiLocation>;
181+
) -> Result<RuntimeOrigin, MultiLocation>;
182182
}
183183

184184
#[impl_trait_for_tuples::impl_for_tuples(30)]

0 commit comments

Comments
 (0)