pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 16:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update codec version to the 4.1 version (#2948)

Browse Source 
* Update codec version to the 4.1 version

* Bump impl_version

* Update lock files

* Update codec to 4.1.1 version

* Bump impl version
This commit is contained in:
Stanislav Tkach
2019-06-26 17:26:24 +03:00
committed by Bastian Köcher
parent 4c52aec260
commit 443ad90b47
69 changed files with 425 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/finality-grandpa/Cargo.toml
+2 -2
View File
@@ -11,7 +11,7 @@ log = "0.4"
parking_lot = "0.8.0"
tokio = "0.1.7"
rand = "0.6"
parity-codec = { version = "3.5.4", features = ["derive"] }
parity-codec = { version = "4.1.1", features = ["derive"] }
runtime_primitives = { package = "sr-primitives", path = "../sr-primitives" }
consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" }
substrate-primitives = { path = "../primitives" }
@@ -23,7 +23,7 @@ network = { package = "substrate-network", path = "../network" }
service = { package = "substrate-service", path = "../service", optional = true }
srml-finality-tracker = { path = "../../srml/finality-tracker" }
fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "primitives" }
grandpa = { package = "finality-grandpa", version = "0.7.2", features = ["derive-codec"] }
grandpa = { package = "finality-grandpa", version = "0.8.0", features = ["derive-codec"], git = "https://github.com/paritytech/finality-grandpa", rev = "f682e3dec54b19c5dd018324028c47f777f3b3a1" }
[dev-dependencies]
consensus_common = { package = "substrate-consensus-common", path = "../consensus/common", features = ["test-helpers"] }
substrate/core/finality-grandpa/primitives/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
client = { package = "substrate-client", path = "../../client", default-features = false }
substrate-primitives = { path = "../../primitives", default-features = false }
parity-codec = { version = "3.5.4", default-features = false, features = ["derive"] }
parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
sr-primitives = { path = "../../sr-primitives", default-features = false }
rstd = { package = "sr-std", path = "../../sr-std", default-features = false }
serde = { version = "1.0", optional = true, features = ["derive"] }
substrate/core/finality-grandpa/src/environment.rs
+3 -3
View File
@@ -30,7 +30,7 @@ use client::{
};
use grandpa::{
BlockNumberOps, Equivocation, Error as GrandpaError, round::State as RoundState,
voter, voter_set::VoterSet,
voter, voter_set::VoterSet, HistoricalVotes,
};
use runtime_primitives::generic::BlockId;
use runtime_primitives::traits::{
@@ -636,7 +636,7 @@ where
round: u64,
state: RoundState<Block::Hash, NumberFor<Block>>,
base: (Block::Hash, NumberFor<Block>),
votes: Vec<SignedMessage<Block>>,
votes: &HistoricalVotes<Block::Hash, NumberFor<Block>, Self::Signature, Self::Id>,
) -> Result<(), Self::Error> {
debug!(
target: "afg", "Voter {} completed round {} in set {}. Estimate = {:?}, Finalized in round = {:?}",
@@ -655,7 +655,7 @@ where
number: round,
state: state.clone(),
base,
votes,
votes: votes.seen().to_owned(),
}) {
let msg = "Voter completed round that is older than the last completed round.";
return Err(Error::Safety(msg.to_string()));