Skip to content

Commit d51de39

Browse files
shawntabrizishawntabrizi
committed
fixes from live
1 parent 0d1e90d commit d51de39

File tree

118 files changed

+728
-700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+728
-700
lines changed

‎src/0/source/changes.diff

+9-9
Original file line numberDiff line numberDiff line change
@@ -4571,7 +4571,7 @@ index 0000000..8b13789
45714571
+
45724572
diff --git a/fundamentals/src/tests/asset.rs b/fundamentals/src/tests/asset.rs
45734573
new file mode 100644
4574-
index 0000000..c6d3418
4574+
index 0000000..1f27042
45754575
--- /dev/null
45764576
+++ b/fundamentals/src/tests/asset.rs
45774577
@@ -0,0 +1,27 @@
@@ -4583,15 +4583,15 @@ index 0000000..c6d3418
45834583
+ assert_eq!(EmptyAssets::get(), Assets::new());
45844584
+ assert_eq!(Usdt::get(), AssetId(Location::new(0, [PalletInstance(50), GeneralIndex(1984)])));
45854585
+ assert_eq!(DotToken::get(), AssetId(Location::new(1, [])));
4586-
+ assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000_000_000u128).into());
4586+
+ assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000u128).into());
45874587
+ assert_eq!(OneHundredDot::get(), (DotToken::get(), 1_000_000_000_000u128).into());
45884588
+}
45894589
+
45904590
+#[test]
45914591
+fn nonfungibles() {
45924592
+ assert_eq!(
45934593
+ NftLocation::get(),
4594-
+ Location::new(1, [Parachain(1000), PalletInstance(52), GeneralIndex(3)])
4594+
+ Location::new(0, [PalletInstance(52), GeneralIndex(3)])
45954595
+ );
45964596
+ assert_eq!(Nft::get(), (NftLocation::get(), 69u64).into());
45974597
+}
@@ -4781,7 +4781,7 @@ index 0000000..7fbd677
47814781
+}
47824782
diff --git a/fundamentals/src/tests/location.rs b/fundamentals/src/tests/location.rs
47834783
new file mode 100644
4784-
index 0000000..77c5390
4784+
index 0000000..5b415d1
47854785
--- /dev/null
47864786
+++ b/fundamentals/src/tests/location.rs
47874787
@@ -0,0 +1,119 @@
@@ -4796,9 +4796,9 @@ index 0000000..77c5390
47964796
+ assert_eq!(PolkadotRelay::get(), Parent.into());
47974797
+ assert_eq!(
47984798
+ PolkadotPara1000Alice::get(),
4799-
+ Location::new(1, [Parachain(1000), AliceBytes::get().into()])
4799+
+ Location::new(0, [AliceBytes::get().into()])
48004800
+ );
4801-
+ assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(1, [PalletInstance(5)]));
4801+
+ assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [PalletInstance(50)]));
48024802
+ assert_eq!(
48034803
+ PolkadotPara1000Asset1984::get(),
48044804
+ Location::new(0, [PalletInstance(50), GeneralIndex(1984)])
@@ -4816,7 +4816,7 @@ index 0000000..77c5390
48164816
+ PolkadotPara1000Alice::get(),
48174817
+ Location::new(0, [Parachain(1000), AliceBytes::get().into()])
48184818
+ );
4819-
+ assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(0, [PalletInstance(5)]));
4819+
+ assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [Parachain(1000), PalletInstance(50)]));
48204820
+ assert_eq!(
48214821
+ PolkadotPara1000Asset1984::get(),
48224822
+ Location::new(0, [Parachain(1000), PalletInstance(50), GeneralIndex(1984)])
@@ -4841,8 +4841,8 @@ index 0000000..77c5390
48414841
+ Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), AliceBytes::get().into()])
48424842
+ );
48434843
+ assert_eq!(
4844-
+ PolkadotRelayBalancesPallet::get(),
4845-
+ Location::new(0, [GlobalConsensus(Polkadot), PalletInstance(5)])
4844+
+ PolkadotPara1000AssetsPallet::get(),
4845+
+ Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50)])
48464846
+ );
48474847
+ assert_eq!(
48484848
+ PolkadotPara1000Asset1984::get(),

‎src/0/source/fundamentals/src/tests/asset.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ fn fungibles() {
66
assert_eq!(EmptyAssets::get(), Assets::new());
77
assert_eq!(Usdt::get(), AssetId(Location::new(0, [PalletInstance(50), GeneralIndex(1984)])));
88
assert_eq!(DotToken::get(), AssetId(Location::new(1, [])));
9-
assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000_000_000u128).into());
9+
assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000u128).into());
1010
assert_eq!(OneHundredDot::get(), (DotToken::get(), 1_000_000_000_000u128).into());
1111
}
1212

1313
#[test]
1414
fn nonfungibles() {
1515
assert_eq!(
1616
NftLocation::get(),
17-
Location::new(1, [Parachain(1000), PalletInstance(52), GeneralIndex(3)])
17+
Location::new(0, [PalletInstance(52), GeneralIndex(3)])
1818
);
1919
assert_eq!(Nft::get(), (NftLocation::get(), 69u64).into());
2020
}

‎src/0/source/fundamentals/src/tests/location.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ fn relative_to_polkadot_para_1000_locations() {
99
assert_eq!(PolkadotRelay::get(), Parent.into());
1010
assert_eq!(
1111
PolkadotPara1000Alice::get(),
12-
Location::new(1, [Parachain(1000), AliceBytes::get().into()])
12+
Location::new(0, [AliceBytes::get().into()])
1313
);
14-
assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(1, [PalletInstance(5)]));
14+
assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [PalletInstance(50)]));
1515
assert_eq!(
1616
PolkadotPara1000Asset1984::get(),
1717
Location::new(0, [PalletInstance(50), GeneralIndex(1984)])
@@ -29,7 +29,7 @@ fn relative_to_polkadot_relay_locations() {
2929
PolkadotPara1000Alice::get(),
3030
Location::new(0, [Parachain(1000), AliceBytes::get().into()])
3131
);
32-
assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(0, [PalletInstance(5)]));
32+
assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [Parachain(1000), PalletInstance(50)]));
3333
assert_eq!(
3434
PolkadotPara1000Asset1984::get(),
3535
Location::new(0, [Parachain(1000), PalletInstance(50), GeneralIndex(1984)])
@@ -54,8 +54,8 @@ fn absolute_locations() {
5454
Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), AliceBytes::get().into()])
5555
);
5656
assert_eq!(
57-
PolkadotRelayBalancesPallet::get(),
58-
Location::new(0, [GlobalConsensus(Polkadot), PalletInstance(5)])
57+
PolkadotPara1000AssetsPallet::get(),
58+
Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50)])
5959
);
6060
assert_eq!(
6161
PolkadotPara1000Asset1984::get(),

‎src/1/solution/fundamentals/src/location.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ use xcm::latest::prelude::*;
2727
// │ │
2828
// ┌─────┴─────┐ ┌──────┴─────┐
2929
// │ Asset │ │ Smart │
30-
// │ wBTC │ │ Contract │
30+
// │ USDT │ │ Contract │
3131
// │ │ │ │
32-
// │ Id 21 │ │ 0x55555... │
32+
// │ Id 1984 │ │ 0x55555... │
3333
// └───────────┘ └────────────┘
3434

3535
/// All these locations are relative to the Polkadot Relay Chain.
@@ -47,8 +47,8 @@ pub mod relative_to_polkadot_relay {
4747
pub AliceBytes: [u8; 32] = ALICE.into();
4848
pub PolkadotPara1000Alice: Location = Location::new(0, [Parachain(1000), AliceBytes::get().into()]);
4949
// The location of the `Assets` pallet on the relay chain.
50-
pub PolkadotRelayBalancesPallet: Location = PalletInstance(5).into();
51-
// The asset with index `21` of the Assets pallet on parachain A with id 1000.
50+
pub PolkadotPara1000AssetsPallet: Location = [Parachain(1000), PalletInstance(50)].into();
51+
// The asset with index `1984` of the Assets pallet on polkadot parachain with id 1000.
5252
pub PolkadotPara1000Asset1984: Location = (Parachain(1000), PalletInstance(50), GeneralIndex(1984)).into();
5353
// The Kusama parachain with id 1000.
5454
pub KusamaPara1000: Location = (Parent, GlobalConsensus(Kusama), Parachain(1000)).into();
@@ -68,9 +68,9 @@ pub mod relative_to_polkadot_para_1000 {
6868
pub PolkadotRelay: Location = Parent.into();
6969
// A 32 byte account on para 1000.
7070
pub AliceBytes: [u8; 32] = ALICE.into();
71-
pub PolkadotPara1000Alice: Location = Location::new(1, [Parachain(1000), AliceBytes::get().into()]);
71+
pub PolkadotPara1000Alice: Location = Location::new(0, [AliceBytes::get().into()]);
7272
// The location of the `Balances` pallet on the relay chain.
73-
pub PolkadotRelayBalancesPallet: Location = (Parent, PalletInstance(5)).into();
73+
pub PolkadotPara1000AssetsPallet: Location = (PalletInstance(50)).into();
7474
// The asset with index `1984` of the Assets pallet on the Polkadot parachain with id 1000.
7575
pub PolkadotPara1000Asset1984: Location = (PalletInstance(50), GeneralIndex(1984)).into();
7676
// The Kusama parachain with id 1000.
@@ -111,7 +111,7 @@ pub mod relative_to_polkadot_para_2000_sc {
111111
// │ NFT │
112112
// │ Kitties │
113113
// │ │
114-
// │ Id 21 │
114+
// │ Id 1984 │
115115
// └───────────┘
116116

117117
/// All these locations are relative to the Kusama Relay Chain.
@@ -155,18 +155,18 @@ pub mod absolute {
155155
parameter_types! {
156156
// The Polkadot parachain with id 1000.
157157
pub PolkadotPara1000: Location = [GlobalConsensus(Polkadot), Parachain(1000)].into();
158-
// The Polkadot parachain with id 1337.
158+
// The Polkadot parachain with id 2004.
159159
pub PolkadotPara2004: Location = [GlobalConsensus(Polkadot), Parachain(2004)].into();
160160
// The Polkadot relay chain.
161161
pub PolkadotRelay: Location = [GlobalConsensus(Polkadot)].into();
162162
// A 32 byte account on para 1000.
163163
pub AliceBytes: [u8; 32] = ALICE.into();
164164
pub PolkadotPara1000Alice: Location = [GlobalConsensus(Polkadot), Parachain(1000), AliceBytes::get().into()].into();
165165
// The location of the `Balances` pallet on the relay chain.
166-
pub PolkadotRelayBalancesPallet: Location = [GlobalConsensus(Polkadot), PalletInstance(5)].into();
166+
pub PolkadotPara1000AssetsPallet: Location = [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50)].into();
167167
// The asset with index `1984` of the Assets pallet on the Polkadot parachain with id 1000.
168168
pub PolkadotPara1000Asset1984: Location = [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50), GeneralIndex(1984)].into();
169-
// The Kusama parachain with id 69.
169+
// The Kusama parachain with id 1000.
170170
pub KusamaPara1000: Location = [GlobalConsensus(Kusama), Parachain(1000)].into();
171171
}
172172
}

‎src/1/solution/fundamentals/src/tests/asset.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ fn fungibles() {
66
assert_eq!(EmptyAssets::get(), Assets::new());
77
assert_eq!(Usdt::get(), AssetId(Location::new(0, [PalletInstance(50), GeneralIndex(1984)])));
88
assert_eq!(DotToken::get(), AssetId(Location::new(1, [])));
9-
assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000_000_000u128).into());
9+
assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000u128).into());
1010
assert_eq!(OneHundredDot::get(), (DotToken::get(), 1_000_000_000_000u128).into());
1111
}
1212

1313
#[test]
1414
fn nonfungibles() {
1515
assert_eq!(
1616
NftLocation::get(),
17-
Location::new(1, [Parachain(1000), PalletInstance(52), GeneralIndex(3)])
17+
Location::new(0, [PalletInstance(52), GeneralIndex(3)])
1818
);
1919
assert_eq!(Nft::get(), (NftLocation::get(), 69u64).into());
2020
}

‎src/1/solution/fundamentals/src/tests/location.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ fn relative_to_polkadot_para_1000_locations() {
99
assert_eq!(PolkadotRelay::get(), Parent.into());
1010
assert_eq!(
1111
PolkadotPara1000Alice::get(),
12-
Location::new(1, [Parachain(1000), AliceBytes::get().into()])
12+
Location::new(0, [AliceBytes::get().into()])
1313
);
14-
assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(1, [PalletInstance(5)]));
14+
assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [PalletInstance(50)]));
1515
assert_eq!(
1616
PolkadotPara1000Asset1984::get(),
1717
Location::new(0, [PalletInstance(50), GeneralIndex(1984)])
@@ -29,7 +29,7 @@ fn relative_to_polkadot_relay_locations() {
2929
PolkadotPara1000Alice::get(),
3030
Location::new(0, [Parachain(1000), AliceBytes::get().into()])
3131
);
32-
assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(0, [PalletInstance(5)]));
32+
assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [Parachain(1000), PalletInstance(50)]));
3333
assert_eq!(
3434
PolkadotPara1000Asset1984::get(),
3535
Location::new(0, [Parachain(1000), PalletInstance(50), GeneralIndex(1984)])
@@ -54,8 +54,8 @@ fn absolute_locations() {
5454
Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), AliceBytes::get().into()])
5555
);
5656
assert_eq!(
57-
PolkadotRelayBalancesPallet::get(),
58-
Location::new(0, [GlobalConsensus(Polkadot), PalletInstance(5)])
57+
PolkadotPara1000AssetsPallet::get(),
58+
Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50)])
5959
);
6060
assert_eq!(
6161
PolkadotPara1000Asset1984::get(),

‎src/1/solution/solution.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/fundamentals/src/location.rs b/fundamentals/src/location.rs
2-
index f3001de..873cbcb 100644
2+
index b5ebea9..a7f912f 100644
33
--- a/fundamentals/src/location.rs
44
+++ b/fundamentals/src/location.rs
55
@@ -38,20 +38,20 @@ pub mod relative_to_polkadot_relay {
@@ -20,8 +20,8 @@ index f3001de..873cbcb 100644
2020
+ pub PolkadotPara1000Alice: Location = Location::new(0, [Parachain(1000), AliceBytes::get().into()]);
2121
// The location of the `Assets` pallet on the relay chain.
2222
- pub PolkadotRelayBalancesPallet: Location = todo!();
23-
+ pub PolkadotRelayBalancesPallet: Location = PalletInstance(5).into();
24-
// The asset with index `21` of the Assets pallet on parachain A with id 1000.
23+
+ pub PolkadotPara1000AssetsPallet: Location = [Parachain(1000), PalletInstance(50)].into();
24+
// The asset with index `1984` of the Assets pallet on polkadot parachain with id 1000.
2525
- pub PolkadotPara1000Asset1984: Location = todo!();
2626
+ pub PolkadotPara1000Asset1984: Location = (Parachain(1000), PalletInstance(50), GeneralIndex(1984)).into();
2727
// The Kusama parachain with id 1000.
@@ -46,10 +46,10 @@ index f3001de..873cbcb 100644
4646
- pub AliceBytes: [u8; 32] = todo!();
4747
- pub PolkadotPara1000Alice: Location = todo!();
4848
+ pub AliceBytes: [u8; 32] = ALICE.into();
49-
+ pub PolkadotPara1000Alice: Location = Location::new(1, [Parachain(1000), AliceBytes::get().into()]);
49+
+ pub PolkadotPara1000Alice: Location = Location::new(0, [AliceBytes::get().into()]);
5050
// The location of the `Balances` pallet on the relay chain.
5151
- pub PolkadotRelayBalancesPallet: Location = todo!();
52-
+ pub PolkadotRelayBalancesPallet: Location = (Parent, PalletInstance(5)).into();
52+
+ pub PolkadotPara1000AssetsPallet: Location = (PalletInstance(50)).into();
5353
// The asset with index `1984` of the Assets pallet on the Polkadot parachain with id 1000.
5454
- pub PolkadotPara1000Asset1984: Location = todo!();
5555
+ pub PolkadotPara1000Asset1984: Location = (PalletInstance(50), GeneralIndex(1984)).into();
@@ -65,7 +65,7 @@ index f3001de..873cbcb 100644
6565
// The Polkadot parachain with id 1000.
6666
- pub PolkadotPara1000: Location = todo!();
6767
+ pub PolkadotPara1000: Location = [GlobalConsensus(Polkadot), Parachain(1000)].into();
68-
// The Polkadot parachain with id 1337.
68+
// The Polkadot parachain with id 2004.
6969
- pub PolkadotPara2004: Location = todo!();
7070
+ pub PolkadotPara2004: Location = [GlobalConsensus(Polkadot), Parachain(2004)].into();
7171
// The Polkadot relay chain.
@@ -77,11 +77,11 @@ index f3001de..873cbcb 100644
7777
+ pub PolkadotPara1000Alice: Location = [GlobalConsensus(Polkadot), Parachain(1000), AliceBytes::get().into()].into();
7878
// The location of the `Balances` pallet on the relay chain.
7979
- pub PolkadotRelayBalancesPallet: Location = todo!();
80-
+ pub PolkadotRelayBalancesPallet: Location = [GlobalConsensus(Polkadot), PalletInstance(5)].into();
80+
+ pub PolkadotPara1000AssetsPallet: Location = [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50)].into();
8181
// The asset with index `1984` of the Assets pallet on the Polkadot parachain with id 1000.
8282
- pub PolkadotPara1000Asset1984: Location = todo!();
8383
+ pub PolkadotPara1000Asset1984: Location = [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50), GeneralIndex(1984)].into();
84-
// The Kusama parachain with id 69.
84+
// The Kusama parachain with id 1000.
8585
- pub KusamaPara1000: Location = todo!();
8686
+ pub KusamaPara1000: Location = [GlobalConsensus(Kusama), Parachain(1000)].into();
8787
}

‎src/1/template/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ For example, take the following topography:
4242
│ │
4343
┌─────┴─────┐ ┌─────┴─────┐
4444
│ Asset │ │ Smart │
45-
│ wBTC │ │ Contract │
45+
│ USDT │ │ Contract │
4646
│ │ │ │
47-
│ Id 21 │ │ 0x55555...│
47+
│ Id 1984 │ │ 0x55555...│
4848
└───────────┘ └───────────┘
4949
```
5050

‎src/1/template/fundamentals/src/location.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ use xcm::latest::prelude::*;
2727
// │ │
2828
// ┌─────┴─────┐ ┌──────┴─────┐
2929
// │ Asset │ │ Smart │
30-
// │ wBTC │ │ Contract │
30+
// │ USDT │ │ Contract │
3131
// │ │ │ │
32-
// │ Id 21 │ │ 0x55555... │
32+
// │ Id 1984 │ │ 0x55555... │
3333
// └───────────┘ └────────────┘
3434

3535
/// All these locations are relative to the Polkadot Relay Chain.
@@ -48,7 +48,7 @@ pub mod relative_to_polkadot_relay {
4848
pub PolkadotPara1000Alice: Location = todo!();
4949
// The location of the `Assets` pallet on the relay chain.
5050
pub PolkadotRelayBalancesPallet: Location = todo!();
51-
// The asset with index `21` of the Assets pallet on parachain A with id 1000.
51+
// The asset with index `1984` of the Assets pallet on polkadot parachain with id 1000.
5252
pub PolkadotPara1000Asset1984: Location = todo!();
5353
// The Kusama parachain with id 1000.
5454
pub KusamaPara1000: Location = todo!();
@@ -111,7 +111,7 @@ pub mod relative_to_polkadot_para_2000_sc {
111111
// │ NFT │
112112
// │ Kitties │
113113
// │ │
114-
// │ Id 21 │
114+
// │ Id 1984 │
115115
// └───────────┘
116116

117117
/// All these locations are relative to the Kusama Relay Chain.
@@ -155,7 +155,7 @@ pub mod absolute {
155155
parameter_types! {
156156
// The Polkadot parachain with id 1000.
157157
pub PolkadotPara1000: Location = todo!();
158-
// The Polkadot parachain with id 1337.
158+
// The Polkadot parachain with id 2004.
159159
pub PolkadotPara2004: Location = todo!();
160160
// The Polkadot relay chain.
161161
pub PolkadotRelay: Location = todo!();
@@ -166,7 +166,7 @@ pub mod absolute {
166166
pub PolkadotRelayBalancesPallet: Location = todo!();
167167
// The asset with index `1984` of the Assets pallet on the Polkadot parachain with id 1000.
168168
pub PolkadotPara1000Asset1984: Location = todo!();
169-
// The Kusama parachain with id 69.
169+
// The Kusama parachain with id 1000.
170170
pub KusamaPara1000: Location = todo!();
171171
}
172172
}

‎src/1/template/fundamentals/src/tests/asset.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ fn fungibles() {
66
assert_eq!(EmptyAssets::get(), Assets::new());
77
assert_eq!(Usdt::get(), AssetId(Location::new(0, [PalletInstance(50), GeneralIndex(1984)])));
88
assert_eq!(DotToken::get(), AssetId(Location::new(1, [])));
9-
assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000_000_000u128).into());
9+
assert_eq!(OneHundredUsdt::get(), (Usdt::get(), 100_000_000u128).into());
1010
assert_eq!(OneHundredDot::get(), (DotToken::get(), 1_000_000_000_000u128).into());
1111
}
1212

1313
#[test]
1414
fn nonfungibles() {
1515
assert_eq!(
1616
NftLocation::get(),
17-
Location::new(1, [Parachain(1000), PalletInstance(52), GeneralIndex(3)])
17+
Location::new(0, [PalletInstance(52), GeneralIndex(3)])
1818
);
1919
assert_eq!(Nft::get(), (NftLocation::get(), 69u64).into());
2020
}

‎src/1/template/fundamentals/src/tests/location.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ fn relative_to_polkadot_para_1000_locations() {
99
assert_eq!(PolkadotRelay::get(), Parent.into());
1010
assert_eq!(
1111
PolkadotPara1000Alice::get(),
12-
Location::new(1, [Parachain(1000), AliceBytes::get().into()])
12+
Location::new(0, [AliceBytes::get().into()])
1313
);
14-
assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(1, [PalletInstance(5)]));
14+
assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [PalletInstance(50)]));
1515
assert_eq!(
1616
PolkadotPara1000Asset1984::get(),
1717
Location::new(0, [PalletInstance(50), GeneralIndex(1984)])
@@ -29,7 +29,7 @@ fn relative_to_polkadot_relay_locations() {
2929
PolkadotPara1000Alice::get(),
3030
Location::new(0, [Parachain(1000), AliceBytes::get().into()])
3131
);
32-
assert_eq!(PolkadotRelayBalancesPallet::get(), Location::new(0, [PalletInstance(5)]));
32+
assert_eq!(PolkadotPara1000AssetsPallet::get(), Location::new(0, [Parachain(1000), PalletInstance(50)]));
3333
assert_eq!(
3434
PolkadotPara1000Asset1984::get(),
3535
Location::new(0, [Parachain(1000), PalletInstance(50), GeneralIndex(1984)])
@@ -54,8 +54,8 @@ fn absolute_locations() {
5454
Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), AliceBytes::get().into()])
5555
);
5656
assert_eq!(
57-
PolkadotRelayBalancesPallet::get(),
58-
Location::new(0, [GlobalConsensus(Polkadot), PalletInstance(5)])
57+
PolkadotPara1000AssetsPallet::get(),
58+
Location::new(0, [GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50)])
5959
);
6060
assert_eq!(
6161
PolkadotPara1000Asset1984::get(),

0 commit comments

Comments
 (0)