Merge branch 'master' into gav-optional-storage

paritytech · Feb 15, 2018 · 79c6b4c · 79c6b4c
2 parents 0f591c6 + b059bc3
commit 79c6b4c
Show file tree

Hide file tree

Showing 42 changed files with 1,610 additions and 1,539 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,13 +14,15 @@ polkadot-cli = { path = "polkadot/cli" }
 [workspace]
 members = [
 	"polkadot/api",
-	"polkadot/candidate-agreement",
 	"polkadot/cli",
 	"polkadot/collator",
+	"polkadot/consensus",
 	"polkadot/executor",
 	"polkadot/primitives",
 	"polkadot/runtime",
+	"polkadot/statement-table",
 	"polkadot/validator",
+	"substrate/bft",
 	"substrate/client",
 	"substrate/codec",
 	"substrate/environmental",

diff --git a/polkadot/candidate-agreement/Cargo.toml b/polkadot/candidate-agreement/Cargo.toml
diff --git a/polkadot/candidate-agreement/src/handle_incoming.rs b/polkadot/candidate-agreement/src/handle_incoming.rs