update codec and grandpa (#1582)

* update codec

* use new codec

* update grandpa code

* build .lock and binaries
This commit is contained in:
thiolliere
2019-01-28 14:16:17 +01:00
committed by GitHub
parent f70fd6e450
commit 0078927ac5
61 changed files with 351 additions and 344 deletions
+2 -2
View File
@@ -8,8 +8,8 @@ num-traits = { version = "0.2", default-features = false }
integer-sqrt = { version = "0.1.2" }
serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true }
parity-codec = { version = "2.2", default-features = false }
parity-codec-derive = { version = "2.1", default-features = false }
parity-codec = { version = "3.0", default-features = false }
parity-codec-derive = { version = "3.0", default-features = false }
substrate-primitives = { path = "../primitives", default-features = false }
sr-std = { path = "../sr-std", default-features = false }
sr-io = { path = "../sr-io", default-features = false }
@@ -16,7 +16,7 @@
//! Generic implementation of a block header.
use codec::{Decode, Encode, Codec, Input, Output, HasCompact};
use codec::{Decode, Encode, Codec, Input, Output, HasCompact, EncodeAsRef};
use traits::{self, Member, SimpleArithmetic, SimpleBitOps, MaybeDisplay,
Hash as HashT, DigestItem as DigestItemT, MaybeSerializeDebug, MaybeSerializeDebugButNotDeserialize};
use generic::Digest;
@@ -74,7 +74,7 @@ impl<Number, Hash, DigestItem> Encode for Header<Number, Hash, DigestItem> where
{
fn encode_to<T: Output>(&self, dest: &mut T) {
dest.push(&self.parent_hash);
dest.push(&<<Number as HasCompact>::Type>::from(self.number));
dest.push(&<<<Number as HasCompact>::Type as EncodeAsRef<_>>::RefType>::from(&self.number));
dest.push(&self.state_root);
dest.push(&self.extrinsics_root);
dest.push(&self.digest);