pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-01 04:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

change junction parachain id from named field to unnamed field (#2940)

Browse Source 
* use unnamed field for parachain variant in junction

* remove outdated comment
This commit is contained in:
Guillaume Thiolliere
2021-04-27 14:49:55 +02:00
committed by GitHub
parent 55c1f7ea92
commit 41e57c4509
8 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/xcm/xcm-builder/src/location_conversion.rs
+4 -4
View File
@@ -64,7 +64,7 @@ impl<
AccountId: Clone,
> Convert<MultiLocation, AccountId> for ChildParachainConvertsVia<ParaId, AccountId> {
fn convert_ref(location: impl Borrow<MultiLocation>) -> Result<AccountId, ()> {
if let &MultiLocation::X1(Junction::Parachain { id }) = location.borrow() {
if let &MultiLocation::X1(Junction::Parachain(id)) = location.borrow() {
Ok(ParaId::from(id).into_account())
} else {
Err(())
@@ -73,7 +73,7 @@ impl<
fn reverse_ref(who: impl Borrow<AccountId>) -> Result<MultiLocation, ()> {
if let Some(id) = ParaId::try_from_account(who.borrow()) {
Ok(Junction::Parachain { id: id.into() }.into())
Ok(Junction::Parachain(id.into()).into())
} else {
Err(())
}
@@ -87,7 +87,7 @@ impl<
AccountId: Clone,
> Convert<MultiLocation, AccountId> for SiblingParachainConvertsVia<ParaId, AccountId> {
fn convert_ref(location: impl Borrow<MultiLocation>) -> Result<AccountId, ()> {
if let &MultiLocation::X2(Junction::Parent, Junction::Parachain { id }) = location.borrow() {
if let &MultiLocation::X2(Junction::Parent, Junction::Parachain(id)) = location.borrow() {
Ok(ParaId::from(id).into_account())
} else {
Err(())
@@ -96,7 +96,7 @@ impl<
fn reverse_ref(who: impl Borrow<AccountId>) -> Result<MultiLocation, ()> {
if let Some(id) = ParaId::try_from_account(who.borrow()) {
Ok([Junction::Parent, Junction::Parachain { id: id.into() }].into())
Ok([Junction::Parent, Junction::Parachain(id.into())].into())
} else {
Err(())
}