Skip to content

Commit ef6d516

Browse files
authored
polkadot v1.13.0 (#1005)
* [asset-registry] allow deprecated xcm types in tests * psvm -v 1.13.0
1 parent 47bff94 commit ef6d516

File tree

2 files changed

+38
-33
lines changed

2 files changed

+38
-33
lines changed

Cargo.dev.toml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
3737
serde = { version = "1.0.189" }
3838
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] }
3939

40-
cumulus-pallet-xcm = { version = "0.13.0", default-features = false }
41-
cumulus-primitives-core = { version = "0.13.0", default-features = false }
42-
frame-benchmarking = { version = "34.0.0", default-features = false }
43-
frame-support = { version = "34.0.0", default-features = false }
44-
frame-system = { version = "34.0.1", default-features = false }
45-
pallet-balances = { version = "35.0.0", default-features = false }
46-
pallet-elections-phragmen = { version = "35.0.0", default-features = false }
47-
pallet-message-queue = { version = "37.0.0", default-features = false }
48-
pallet-preimage = { version = "34.0.0", default-features = false }
49-
pallet-root-testing = { version = "10.0.0", default-features = false }
50-
pallet-scheduler = { version = "35.0.0", default-features = false }
51-
pallet-timestamp = { version = "33.0.0", default-features = false }
52-
pallet-treasury = { version = "33.0.0", default-features = false }
53-
pallet-xcm = { version = "13.0.0", default-features = false }
54-
polkadot-parachain-primitives = { version = "12.0.0", default-features = false }
55-
polkadot-runtime-common = { version = "13.0.0", default-features = false }
56-
polkadot-runtime-parachains = { version = "13.0.0", default-features = false }
57-
sp-api = { version = "32.0.0", default-features = false }
58-
sp-application-crypto = { version = "36.0.0", default-features = false }
40+
cumulus-pallet-xcm = { version = "0.14.0", default-features = false }
41+
cumulus-primitives-core = { version = "0.14.0", default-features = false }
42+
frame-benchmarking = { version = "35.0.0", default-features = false }
43+
frame-support = { version = "35.0.0", default-features = false }
44+
frame-system = { version = "35.0.0", default-features = false }
45+
pallet-balances = { version = "36.0.0", default-features = false }
46+
pallet-elections-phragmen = { version = "36.0.0", default-features = false }
47+
pallet-message-queue = { version = "38.0.0", default-features = false }
48+
pallet-preimage = { version = "35.0.0", default-features = false }
49+
pallet-root-testing = { version = "11.0.0", default-features = false }
50+
pallet-scheduler = { version = "36.0.0", default-features = false }
51+
pallet-timestamp = { version = "34.0.0", default-features = false }
52+
pallet-treasury = { version = "34.0.0", default-features = false }
53+
pallet-xcm = { version = "14.0.0", default-features = false }
54+
polkadot-parachain-primitives = { version = "13.0.0", default-features = false }
55+
polkadot-runtime-common = { version = "14.0.0", default-features = false }
56+
polkadot-runtime-parachains = { version = "14.0.0", default-features = false }
57+
sp-api = { version = "33.0.0", default-features = false }
58+
sp-application-crypto = { version = "37.0.0", default-features = false }
5959
sp-arithmetic = { version = "26.0.0", default-features = false }
60-
sp-core = { version = "33.0.1", default-features = false }
61-
sp-io = { version = "36.0.0", default-features = false }
62-
sp-runtime = { version = "37.0.0", default-features = false }
63-
sp-runtime-interface = { version = "27.0.0", default-features = false }
64-
sp-staking = { version = "32.0.0", default-features = false }
60+
sp-core = { version = "34.0.0", default-features = false }
61+
sp-io = { version = "37.0.0", default-features = false }
62+
sp-runtime = { version = "38.0.0", default-features = false }
63+
sp-runtime-interface = { version = "28.0.0", default-features = false }
64+
sp-staking = { version = "33.0.0", default-features = false }
6565
sp-std = { version = "14.0.0", default-features = false }
6666
sp-storage = { version = "21.0.0", default-features = false }
67-
xcm = { version = "13.0.1", package = "staging-xcm", default-features = false }
68-
xcm-builder = { version = "13.0.0", package = "staging-xcm-builder", default-features = false }
69-
xcm-executor = { version = "13.0.0", package = "staging-xcm-executor", default-features = false }
67+
xcm = { version = "14.0.0", package = "staging-xcm", default-features = false }
68+
xcm-builder = { version = "14.0.0", package = "staging-xcm-builder", default-features = false }
69+
xcm-executor = { version = "14.0.0", package = "staging-xcm-executor", default-features = false }
7070

71-
xcm-simulator = { version = "13.0.0" }
71+
xcm-simulator = { version = "14.0.0" }

asset-registry/src/tests.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ use sp_runtime::{
2020
use xcm::{v3, v4::prelude::*, VersionedLocation};
2121
use xcm_simulator::TestExt;
2222

23+
#[allow(deprecated)]
2324
type OldLocation = xcm::v2::MultiLocation;
25+
#[allow(deprecated)]
2426
type OldJunctions = xcm::v2::Junctions;
27+
#[allow(deprecated)]
2528
type OldJunction = xcm::v2::Junction;
2629

2730
fn treasury_account() -> AccountId32 {
@@ -585,12 +588,14 @@ fn test_asset_authority() {
585588
#[test]
586589
fn test_v2_to_v3_incompatible_multilocation() {
587590
// Assert that V2 and V3 Location both are encoded differently
591+
592+
#[allow(deprecated)]
593+
let old_location = OldLocation::new(
594+
0,
595+
OldJunctions::X1(OldJunction::GeneralKey(vec![0].try_into().unwrap())),
596+
);
588597
assert!(
589-
OldLocation::new(
590-
0,
591-
OldJunctions::X1(OldJunction::GeneralKey(vec![0].try_into().unwrap()))
592-
)
593-
.encode() != Location::new(0, [Junction::from(BoundedVec::try_from(vec![0]).unwrap())]).encode()
598+
old_location.encode() != Location::new(0, [Junction::from(BoundedVec::try_from(vec![0]).unwrap())]).encode()
594599
);
595600
}
596601

0 commit comments

Comments
 (0)