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

Move grandpa crates to consensus folder #13458

Merged
merged 10 commits into from
Feb 27, 2023
Merged

Move grandpa crates to consensus folder #13458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
abe6262
Move grandpa under consensus dir
davxy Feb 23, 2023
869f6b5
Rename grandpa folder
davxy Feb 23, 2023
415da00
Finish grandpa renaming
davxy Feb 23, 2023
9070e78
Minor tweaks
davxy Feb 23, 2023
cce7941
Merge branch 'master' into move-grandpa-to-consensus
davxy Feb 24, 2023
2d85693
Cargo fmt
davxy Feb 24, 2023
178935c
Adjust path to chain spec
davxy Feb 24, 2023
d4782da
Merge branch 'master' into move-grandpa-to-consensus
davxy Feb 27, 2023
d26b525
Trigger pipeline
davxy Feb 27, 2023
377730f
Trigger pipeline 2
davxy Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 101 additions & 99 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ members = [
"client/consensus/babe/rpc",
"client/consensus/common",
"client/consensus/epochs",
"client/consensus/grandpa",
"client/consensus/grandpa/rpc",
"client/consensus/manual-seal",
"client/consensus/pow",
"client/consensus/slots",
Expand All @@ -38,8 +40,6 @@ members = [
"client/executor/runtime-test",
"client/executor/wasmi",
"client/executor/wasmtime",
"client/finality-grandpa",
"client/finality-grandpa/rpc",
"client/informant",
"client/keystore",
"client/merkle-mountain-range",
Expand Down Expand Up @@ -184,6 +184,7 @@ members = [
"primitives/consensus/aura",
"primitives/consensus/babe",
"primitives/consensus/common",
"primitives/consensus/grandpa",
"primitives/consensus/pow",
"primitives/consensus/slots",
"primitives/consensus/vrf",
Expand All @@ -193,7 +194,6 @@ members = [
"primitives/database",
"primitives/debug-derive",
"primitives/externalities",
"primitives/finality-grandpa",
"primitives/inherents",
"primitives/io",
"primitives/keyring",
Expand Down
4 changes: 2 additions & 2 deletions bin/node-template/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ sc-consensus-aura = { version = "0.10.0-dev", path = "../../../client/consensus/
sp-consensus-aura = { version = "0.10.0-dev", path = "../../../primitives/consensus/aura" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality-grandpa" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/finality-grandpa" }
sc-consensus-grandpa = { version = "0.10.0-dev", path = "../../../client/consensus/grandpa" }
sp-consensus-grandpa = { version = "4.0.0-dev", path = "../../../primitives/consensus/grandpa" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
sp-runtime = { version = "7.0.0", path = "../../../primitives/runtime" }
sp-io = { version = "7.0.0", path = "../../../primitives/io" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node-template/node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use node_template_runtime::{
};
use sc_service::ChainType;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_consensus_grandpa::AuthorityId as GrandpaId;
use sp_core::{sr25519, Pair, Public};
use sp_finality_grandpa::AuthorityId as GrandpaId;
use sp_runtime::traits::{IdentifyAccount, Verify};

// The URL for the telemetry server.
Expand Down
2 changes: 1 addition & 1 deletion bin/node-template/node/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub fn run() -> sc_cli::Result<()> {
let PartialComponents { client, task_manager, backend, .. } =
service::new_partial(&config)?;
let aux_revert = Box::new(|client, _, blocks| {
sc_finality_grandpa::revert(client, blocks)?;
sc_consensus_grandpa::revert(client, blocks)?;
Ok(())
});
Ok((cmd.run(client, backend, Some(aux_revert)), task_manager))
Expand Down
Loading