Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit ddb111f

Browse files
cectoncecton
committed
Merge branch 'cecton-int-test' into cecton-use-custom-block-announce-validator
2 parents 542eb35 + 6eca4f0 commit ddb111f

File tree

19 files changed

+1723
-2447
lines changed

19 files changed

+1723
-2447
lines changed

‎.editorconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ indent_style=space
2020
indent_size=4
2121
tab_width=8
2222
end_of_line=lf
23+
24+
[*.json]
25+
indent_style=space
26+
indent_size=2
27+
tab_width=8
28+
end_of_line=lf
29+

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ test-linux-stable:
6363
script:
6464
- time cargo test --all --release --locked |
6565
tee output.log
66+
- time cargo test --release -- --ignored integration_test |
67+
tee -a output.log
6668
- sccache -s
6769
after_script:
6870
- echo "___Collecting warnings for check_warnings job___"

‎Cargo.lock‎

Lines changed: 1121 additions & 2293 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎collator/Cargo.toml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ edition = "2018"
66

77
[dependencies]
88
# Substrate dependencies
9-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
10-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
11-
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
12-
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
13-
sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
14-
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
15-
sc-service = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
16-
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
9+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
10+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
11+
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
12+
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
13+
sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
14+
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
15+
sc-service = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
16+
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
1717

1818
# Polkadot dependencies
19-
polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
20-
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
21-
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
22-
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
23-
polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
19+
polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
20+
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
21+
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
22+
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
23+
polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
2424

2525
# Cumulus dependencies
2626
cumulus-consensus = { path = "../consensus" }
@@ -40,13 +40,13 @@ test-runtime = { package = "cumulus-test-runtime", path = "../test/runtime" }
4040
test-client = { package = "cumulus-test-client", path = "../test/client" }
4141

4242
# Substrate dependencies
43-
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
44-
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
45-
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
46-
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
43+
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
44+
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
45+
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
46+
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
4747

4848
# Polkadot dependencies
49-
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
49+
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
5050

5151
# Other dependencies
5252
env_logger = "0.7.1"

‎collator/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ mod tests {
511511
let _ = env_logger::try_init();
512512
let spawner = futures::executor::ThreadPool::new().unwrap();
513513
let announce_block = |_, _| ();
514+
let block_announce_validator = DelayedBlockAnnounceValidator::new();
514515

515516
let builder = CollatorBuilder::new(
516517
DummyFactory,
@@ -519,6 +520,7 @@ mod tests {
519520
id,
520521
Arc::new(TestClientBuilder::new().build()),
521522
Arc::new(announce_block),
523+
block_announce_validator,
522524
);
523525
let context = builder
524526
.build(

‎consensus/Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ edition = "2018"
77

88
[dependencies]
99
# substrate deps
10-
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
11-
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
12-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
13-
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
14-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
15-
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
16-
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
17-
sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
10+
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
11+
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
12+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
13+
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
14+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
15+
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
16+
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
17+
sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
1818

1919
# polkadot deps
20-
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
21-
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
20+
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
21+
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
2222

2323
# other deps
2424
futures = { version = "0.3.1", features = ["compat"] }

‎message-broker/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ edition = "2018"
66

77
[dependencies]
88
# substrate deps
9-
frame-support = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator", default-features = false }
10-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator", default-features = false }
11-
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator", default-features = false }
9+
frame-support = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
10+
frame-system = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
11+
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
1212

1313
# Other dependencies
1414
codec = { package = "parity-scale-codec", version = "1.3.0", features = [ "derive" ], default-features = false }

‎network/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ edition = "2018"
77

88
[dependencies]
99
# substrate deps
10-
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
11-
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
12-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
13-
sp-api = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator" }
10+
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
11+
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
12+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
13+
sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
1414

1515
# polkadot deps
16-
polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
17-
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
18-
polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
19-
polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
20-
polkadot-network = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator" }
16+
polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
17+
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
18+
polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
19+
polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
20+
polkadot-network = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch" }
2121

2222
# other deps
2323
codec = { package = "parity-scale-codec", version = "1.3.0", features = [ "derive" ] }

‎parachain-upgrade/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cumulus-primitives = { path = "../primitives", default-features = false }
2626
cumulus-runtime = { path = "../runtime", default-features = false }
2727

2828
# Polkadot dependencies
29-
parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator", default-features = false }
29+
parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch", default-features = false }
3030

3131
# Substrate dependencies
3232
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "cumulus-branch", default-features = false }

‎primitives/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ edition = "2018"
66

77
[dependencies]
88
# Substrate dependencies
9-
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator", default-features = false }
10-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "cecton-use-custom-block-announce-validator", default-features = false }
9+
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
10+
sp-std = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
1111

1212
# Polkadot dependencies
13-
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator", default-features = false }
14-
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cecton-use-custom-block-announce-validator", default-features = false }
13+
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch", default-features = false }
14+
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch", default-features = false }
1515

1616
# Other dependencies
1717
codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = [ "derive" ] }

0 commit comments

Comments
 (0)