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

Commit eeb0f0b

Browse files
authored
Merge branch 'master' into gav-optional-storage
2 parents 9dba812 + b059bc3 commit eeb0f0b

File tree

42 files changed

+1609
-1546
lines changed

Some content is hidden

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

42 files changed

+1609
-1546
lines changed

Cargo.lock

+46-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ polkadot-cli = { path = "polkadot/cli" }
1414
[workspace]
1515
members = [
1616
"polkadot/api",
17-
"polkadot/candidate-agreement",
1817
"polkadot/cli",
1918
"polkadot/collator",
19+
"polkadot/consensus",
2020
"polkadot/executor",
2121
"polkadot/primitives",
2222
"polkadot/runtime",
23+
"polkadot/statement-table",
2324
"polkadot/validator",
25+
"substrate/bft",
2426
"substrate/client",
2527
"substrate/codec",
2628
"substrate/environmental",

polkadot/candidate-agreement/Cargo.toml

-9
This file was deleted.

polkadot/candidate-agreement/src/handle_incoming.rs

-214
This file was deleted.

0 commit comments

Comments
 (0)