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

rename fg-primitives to more verbose name #1123

Merged
rphmeier merged 1 commit into from
Nov 16, 2018
Merged

rename fg-primitives to more verbose name #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 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.

2 changes: 1 addition & 1 deletion core/finality-grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ substrate-client = { path = "../client" }
log = "0.4"
parking_lot = "0.4"
tokio = "0.1.7"
substrate-fg-primitives = { path = "primitives" }
substrate-finality-grandpa-primitives = { path = "primitives" }

[dependencies.finality-grandpa]
version = "0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion core/finality-grandpa/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "substrate-fg-primitives"
name = "substrate-finality-grandpa-primitives"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]

Expand Down
2 changes: 1 addition & 1 deletion core/finality-grandpa/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extern crate substrate_primitives;
extern crate tokio;
extern crate parking_lot;
extern crate parity_codec as codec;
extern crate substrate_fg_primitives as fg_primitives;
extern crate substrate_finality_grandpa_primitives as fg_primitives;

#[macro_use]
extern crate log;
Expand Down
4 changes: 2 additions & 2 deletions node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parity-codec-derive = "2.1"
sr-std = { path = "../../core/sr-std" }
srml-support = { path = "../../srml/support" }
substrate-primitives = { path = "../../core/primitives" }
substrate-fg-primitives = { path = "../../core/finality-grandpa/primitives" }
substrate-finality-grandpa-primitives = { path = "../../core/finality-grandpa/primitives" }
substrate-client = { path = "../../core/client" }
substrate-keyring = { path = "../../core/keyring" }
srml-balances = { path = "../../srml/balances" }
Expand Down Expand Up @@ -59,5 +59,5 @@ std = [
"serde/std",
"safe-mix/std",
"substrate-client/std",
"substrate-fg-primitives/std",
"substrate-finality-grandpa-primitives/std",
]
6 changes: 3 additions & 3 deletions node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extern crate srml_upgrade_key as upgrade_key;
#[macro_use]
extern crate sr_version as version;
extern crate node_primitives;
extern crate substrate_fg_primitives;
extern crate substrate_finality_grandpa_primitives;

#[cfg(feature = "std")]
use codec::{Encode, Decode};
Expand Down Expand Up @@ -85,7 +85,7 @@ use council::seats as council_seats;
#[cfg(any(feature = "std", test))]
use version::NativeVersion;
use substrate_primitives::OpaqueMetadata;
use substrate_fg_primitives::{runtime::GrandpaApi, ScheduledChange};
use substrate_finality_grandpa_primitives::{runtime::GrandpaApi, ScheduledChange};

#[cfg(any(feature = "std", test))]
pub use runtime_primitives::BuildStorage;
Expand Down Expand Up @@ -398,7 +398,7 @@ impl client::runtime_api::Metadata<GBlock> for ClientWithApi {
}

#[cfg(feature = "std")]
impl substrate_fg_primitives::GrandpaApi<GBlock> for ClientWithApi {
impl substrate_finality_grandpa_primitives::GrandpaApi<GBlock> for ClientWithApi {
fn grandpa_pending_change(&self, at: &GBlockId, digest: &DigestFor<GBlock>)
-> Result<Option<ScheduledChange<NumberFor<GBlock>>>, client::error::Error> {
self.call_api_at(at, "grandpa_pending_change", digest)
Expand Down
4 changes: 2 additions & 2 deletions node/runtime/wasm/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions node/runtime/wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ safe-mix = { version = "1.0", default-features = false }
parity-codec-derive = { version = "2.1" }
parity-codec = { version = "2.1", default-features = false }
substrate-primitives = { path = "../../../core/primitives", default-features = false }
substrate-fg-primitives = { path = "../../../core/finality-grandpa/primitives", default-features = false }
substrate-finality-grandpa-primitives = { path = "../../../core/finality-grandpa/primitives", default-features = false }
substrate-client = { path = "../../../core/client", default-features = false }
sr-std = { path = "../../../core/sr-std", default-features = false }
srml-support = { path = "../../../srml/support", default-features = false }
Expand All @@ -39,7 +39,7 @@ std = [
"parity-codec/std",
"substrate-primitives/std",
"substrate-client/std",
"substrate-fg-primitives/std",
"substrate-finality-grandpa-primitives/std",
"sr-std/std",
"srml-support/std",
"srml-balances/std",
Expand Down