Skip to content

Commit 18d14ff

Browse files
1xstjxlczjb0807
authored
update polkadot-v0.9.28 (#799)
* update polkadot-v0.9.28 * fix mock * fix authority events and ensure make-dev test passes * remove debug logs * Update tests.rs Co-authored-by: Bryan Chen <[email protected]> Co-authored-by: zjb0807 <[email protected]>
1 parent 27115ac commit 18d14ff

File tree

28 files changed

+262
-260
lines changed

28 files changed

+262
-260
lines changed

‎Cargo.dev.toml‎

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

‎asset-registry/Cargo.toml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,37 @@ serde = { version = "1.0.136", optional = true }
1313
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
1414

1515
# substrate
16-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
17-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
18-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
19-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
16+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
17+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
18+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
19+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
2020

2121
# polkadot
22-
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.27" }
23-
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.27" }
24-
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.27" }
25-
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.27" }
22+
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.28" }
23+
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.28" }
24+
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.28" }
25+
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.28" }
2626

2727
# orml
2828
orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
2929

3030
[dev-dependencies]
3131
# substrate
32-
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
33-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
34-
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
32+
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
33+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
34+
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
3535

3636
# cumulus
37-
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" }
38-
cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" }
39-
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" }
40-
cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" }
41-
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" }
37+
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.28" }
38+
cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.28" }
39+
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.28" }
40+
cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.28" }
41+
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.28" }
4242

4343
# polkadot
44-
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }
45-
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }
46-
xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" }
44+
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.28" }
45+
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.28" }
46+
xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.28" }
4747

4848
# orml
4949
orml-tokens = { path = "../tokens" }

‎auction/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive"
1212
serde = { version = "1.0.136", optional = true }
1313
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
1414

15-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
16-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
17-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
18-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
15+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
16+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
17+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
18+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
1919

2020
orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
2121

2222
[dev-dependencies]
23-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
24-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
23+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
24+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
2525

2626
[features]
2727
default = ["std"]

‎authority/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive"
1212
serde = { version = "1.0.136", optional = true }
1313
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
1414

15-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
16-
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
17-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
18-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
19-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
15+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
16+
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
17+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
18+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
19+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
2020

2121
[dev-dependencies]
22-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
23-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
24-
pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
22+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
23+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
24+
pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
2525

2626
[features]
2727
default = ["std"]

‎authority/src/tests.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ fn schedule_dispatch_at_work() {
6363
call: Box::new(ensure_root_call),
6464
});
6565
run_to_block(1);
66-
assert_eq!(
66+
assert_noop!(
6767
Authority::schedule_dispatch(Origin::root(), DispatchTime::At(1), 0, true, Box::new(call.clone())),
68-
Err(Error::<Runtime>::FailedToSchedule.into())
68+
Error::<Runtime>::FailedToSchedule
6969
);
7070

7171
assert_ok!(Authority::schedule_dispatch(
@@ -80,13 +80,13 @@ fn schedule_dispatch_at_work() {
8080
delay: 1,
8181
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
8282
}),
83-
index: 1,
83+
index: 0,
8484
}));
8585

8686
run_to_block(2);
8787
System::assert_last_event(mock::Event::Scheduler(pallet_scheduler::Event::<Runtime>::Dispatched {
8888
task: (2, 0),
89-
id: Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()),
89+
id: Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0].to_vec()),
9090
result: Ok(()),
9191
}));
9292

@@ -100,13 +100,13 @@ fn schedule_dispatch_at_work() {
100100
));
101101
System::assert_last_event(mock::Event::Authority(Event::Scheduled {
102102
origin: OriginCaller::system(RawOrigin::Root),
103-
index: 2,
103+
index: 1,
104104
}));
105105

106106
run_to_block(3);
107107
System::assert_last_event(mock::Event::Scheduler(pallet_scheduler::Event::<Runtime>::Dispatched {
108108
task: (3, 0),
109-
id: Some([0, 0, 2, 0, 0, 0].to_vec()),
109+
id: Some([0, 0, 1, 0, 0, 0].to_vec()),
110110
result: Ok(()),
111111
}));
112112
});
@@ -121,9 +121,9 @@ fn schedule_dispatch_after_work() {
121121
call: Box::new(ensure_root_call),
122122
});
123123
run_to_block(1);
124-
assert_eq!(
124+
assert_noop!(
125125
Authority::schedule_dispatch(Origin::root(), DispatchTime::At(0), 0, true, Box::new(call.clone())),
126-
Err(ArithmeticError::Overflow.into())
126+
ArithmeticError::Overflow
127127
);
128128

129129
assert_ok!(Authority::schedule_dispatch(
@@ -138,13 +138,13 @@ fn schedule_dispatch_after_work() {
138138
delay: 0,
139139
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
140140
}),
141-
index: 1,
141+
index: 0,
142142
}));
143143

144144
run_to_block(2);
145145
System::assert_last_event(mock::Event::Scheduler(pallet_scheduler::Event::<Runtime>::Dispatched {
146146
task: (2, 0),
147-
id: Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()),
147+
id: Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0].to_vec()),
148148
result: Ok(()),
149149
}));
150150

@@ -158,13 +158,13 @@ fn schedule_dispatch_after_work() {
158158
));
159159
System::assert_last_event(mock::Event::Authority(Event::Scheduled {
160160
origin: OriginCaller::system(RawOrigin::Root),
161-
index: 2,
161+
index: 1,
162162
}));
163163

164164
run_to_block(3);
165165
System::assert_last_event(mock::Event::Scheduler(pallet_scheduler::Event::<Runtime>::Dispatched {
166166
task: (3, 0),
167-
id: Some([0, 0, 2, 0, 0, 0].to_vec()),
167+
id: Some([0, 0, 1, 0, 0, 0].to_vec()),
168168
result: Ok(()),
169169
}));
170170
});

‎bencher/Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ hash-db = { version = "0.15.2", default-features = false, optional = true }
2626
bencher-procedural = { path = "bencher-procedural", default-features = false }
2727
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
2828

29-
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
30-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
31-
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
32-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
33-
sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.27" }
34-
sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.27" }
35-
sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.27" }
36-
sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.27" }
37-
sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.27" }
38-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
39-
sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
40-
sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.27" }
29+
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
30+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
31+
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
32+
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
33+
sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.28" }
34+
sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.28" }
35+
sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.28" }
36+
sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.28" }
37+
sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.28" }
38+
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
39+
sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
40+
sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.28" }
4141

4242
[features]
4343
default = ["std"]

‎bencher/test/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ required-features = ["bench"]
1515
serde = { version = "1.0.136", optional = true }
1616
scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
1717
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
18-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
19-
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
20-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
21-
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
22-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
18+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
19+
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
20+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
21+
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
22+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
2323
orml-bencher = { path = "..", default-features = false }
2424
orml-weight-meter = { path = "../../weight-meter", default-features = false }
2525

2626
[dev-dependencies]
27-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
27+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
2828

2929
[features]
3030
default = ["std"]

‎benchmarking/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
1414
scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
1515
log = { version = "0.4.17", default-features = false }
1616

17-
sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
18-
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
19-
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
20-
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
21-
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
22-
sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
23-
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
24-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.27" }
17+
sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
18+
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
19+
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
20+
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
21+
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
22+
sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
23+
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
24+
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.28" }
2525

2626
[dev-dependencies]
2727
hex-literal = "0.3.4"
2828

29-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
29+
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" }
3030

3131
[features]
3232
default = [ "std" ]

0 commit comments

Comments
 (0)