Move BEEFY code to consensus

Cargo.toml

@@ -18,15 +18,15 @@ members = [
 	"client/api",
 	"client/authority-discovery",
 	"client/basic-authorship",
-	"client/beefy",
-	"client/beefy/rpc",
 	"client/block-builder",
 	"client/chain-spec",
 	"client/chain-spec/derive",
 	"client/cli",
 	"client/consensus/aura",
 	"client/consensus/babe",
 	"client/consensus/babe/rpc",
+	"client/consensus/beefy",
+	"client/consensus/beefy/rpc",
 	"client/consensus/common",
 	"client/consensus/epochs",
 	"client/consensus/grandpa",
@@ -178,11 +178,11 @@ members = [
 	"primitives/arithmetic",
 	"primitives/arithmetic/fuzzer",
 	"primitives/authority-discovery",
-	"primitives/beefy",
 	"primitives/block-builder",
 	"primitives/blockchain",
 	"primitives/consensus/aura",
 	"primitives/consensus/babe",
+	"primitives/consensus/beefy",
 	"primitives/consensus/common",
 	"primitives/consensus/grandpa",
 	"primitives/consensus/pow",

client/consensus/beefy/Cargo.toml

@@ -0,0 +1,49 @@
+[package]
+name = "sc-consensus-beefy"
+version = "4.0.0-dev"
+authors = ["Parity Technologies <[email protected]>"]
+edition = "2021"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+repository = "https://github.com/paritytech/substrate"
+description = "BEEFY Client gadget for substrate"
+homepage = "https://substrate.io"
+
+[dependencies]
+array-bytes = "4.1"
+async-trait = "0.1.57"
+codec = { package = "parity-scale-codec", version = "3.2.2", features = ["derive"] }
+fnv = "1.0.6"
+futures = "0.3"
+log = "0.4"
+parking_lot = "0.12.1"
+thiserror = "1.0"
+wasm-timer = "0.2.5"
+prometheus = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", path = "../../../utils/prometheus" }
+sc-client-api = { version = "4.0.0-dev", path = "../../api" }
+sc-consensus = { version = "0.10.0-dev", path = "../../consensus/common" }
+sc-keystore = { version = "4.0.0-dev", path = "../../keystore" }
+sc-network = { version = "0.10.0-dev", path = "../../network" }
+sc-network-common = { version = "0.10.0-dev", path = "../../network/common" }
+sc-network-gossip = { version = "0.10.0-dev", path = "../../network-gossip" }
+sc-utils = { version = "4.0.0-dev", path = "../../utils" }
+sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
+sp-application-crypto = { version = "7.0.0", path = "../../../primitives/application-crypto" }
+sp-arithmetic = { version = "6.0.0", path = "../../../primitives/arithmetic" }
+sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
+sp-consensus-beefy = { version = "4.0.0-dev", path = "../../../primitives/consensus/beefy" }
+sp-core = { version = "7.0.0", path = "../../../primitives/core" }
+sp-keystore = { version = "0.13.0", path = "../../../primitives/keystore" }
+sp-mmr-primitives = { version = "4.0.0-dev", path = "../../../primitives/merkle-mountain-range" }
+sp-runtime = { version = "7.0.0", path = "../../../primitives/runtime" }
+
+[dev-dependencies]
+serde = "1.0.136"
+tempfile = "3.1.0"
+tokio = "1.22.0"
+sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
+sc-network-test = { version = "0.8.0", path = "../../network/test" }
+sp-consensus-grandpa = { version = "4.0.0-dev", path = "../../../primitives/consensus/grandpa" }
+sp-keyring = { version = "7.0.0", path = "../../../primitives/keyring" }
+sp-tracing = { version = "6.0.0", path = "../../../primitives/tracing" }
+substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }

client/beefy/rpc/Cargo.toml → client/consensus/beefy/rpc/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "beefy-gadget-rpc"
+name = "sc-consensus-beefy-rpc"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
@@ -16,16 +16,14 @@ log = "0.4"
 parking_lot = "0.12.1"
 serde = { version = "1.0.136", features = ["derive"] }
 thiserror = "1.0"
-beefy-gadget = { version = "4.0.0-dev", path = "../." }
-beefy-primitives = { version = "4.0.0-dev", path = "../../../primitives/beefy", package = "sp-beefy" }
-sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
-sp-core = { version = "7.0.0", path = "../../../primitives/core" }
-sp-runtime = { version = "7.0.0", path = "../../../primitives/runtime" }
+sc-consensus-beefy = { version = "4.0.0-dev", path = "../" }
+sp-consensus-beefy = { version = "4.0.0-dev", path = "../../../../primitives/consensus/beefy" }
+sc-rpc = { version = "4.0.0-dev", path = "../../../rpc" }
+sp-core = { version = "7.0.0", path = "../../../../primitives/core" }
+sp-runtime = { version = "7.0.0", path = "../../../../primitives/runtime" }
 
 [dev-dependencies]
 serde_json = "1.0.85"
-sc-rpc = { version = "4.0.0-dev", features = [
-	"test-helpers",
-], path = "../../rpc" }
-substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
+sc-rpc = { version = "4.0.0-dev", features = ["test-helpers"], path = "../../../rpc" }
+substrate-test-runtime-client = { version = "2.0.0", path = "../../../../test-utils/runtime/client" }
 tokio = { version = "1.22.0", features = ["macros"] }