mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-17 21:45:41 +00:00
Companion for paritytech/substrate#11631 (#5671)
* Companion for paritytech/substrate#11631 * Fixes * Update sp-runtime * Fixes * update lockfile for {"substrate"} * remove unused Co-authored-by: parity-processbot <> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
|
||||
use super::Junction;
|
||||
use core::{mem, result};
|
||||
use parity_scale_codec::{Decode, Encode};
|
||||
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
|
||||
use scale_info::TypeInfo;
|
||||
|
||||
/// A relative path between state-bearing consensus systems.
|
||||
@@ -47,7 +47,7 @@ use scale_info::TypeInfo;
|
||||
/// that a value is strictly an interior location, in those cases, `Junctions` may be used.
|
||||
///
|
||||
/// The `MultiLocation` value of `Null` simply refers to the interpreting consensus system.
|
||||
#[derive(Clone, Decode, Encode, Eq, PartialEq, Ord, PartialOrd, Debug, TypeInfo)]
|
||||
#[derive(Clone, Decode, Encode, Eq, PartialEq, Ord, PartialOrd, Debug, TypeInfo, MaxEncodedLen)]
|
||||
pub struct MultiLocation {
|
||||
/// The number of parent junctions at the beginning of this `MultiLocation`.
|
||||
pub parents: u8,
|
||||
@@ -425,7 +425,7 @@ const MAX_JUNCTIONS: usize = 8;
|
||||
///
|
||||
/// Parent junctions cannot be constructed with this type. Refer to `MultiLocation` for
|
||||
/// instructions on constructing parent junctions.
|
||||
#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo)]
|
||||
#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
|
||||
pub enum Junctions {
|
||||
/// The interpreting consensus system.
|
||||
Here,
|
||||
@@ -1011,7 +1011,6 @@ mod tests {
|
||||
#[test]
|
||||
fn conversion_from_other_types_works() {
|
||||
use crate::v0;
|
||||
|
||||
fn takes_multilocation<Arg: Into<MultiLocation>>(_arg: Arg) {}
|
||||
|
||||
takes_multilocation(Parent);
|
||||
@@ -1042,10 +1041,13 @@ mod tests {
|
||||
v0::MultiLocation::X3(
|
||||
v0::Junction::Parent,
|
||||
v0::Junction::Parent,
|
||||
v0::Junction::GeneralKey(b"foo".to_vec()),
|
||||
v0::Junction::GeneralKey(b"foo".to_vec().try_into().unwrap()),
|
||||
)
|
||||
.try_into(),
|
||||
Ok(MultiLocation { parents: 2, interior: X1(GeneralKey(b"foo".to_vec())) }),
|
||||
Ok(MultiLocation {
|
||||
parents: 2,
|
||||
interior: X1(GeneralKey(b"foo".to_vec().try_into().unwrap()))
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user