Update to parity-scale-codec (#3232)

* WIP: update codec

* WIP

* compiling

* WIP

* rename parity-scale-codec to codec

* WIP

* fix

* remove old comments

* use published crates

* fix expected error msg

* bump version

* fmt and fix

* remove old comment

* fix wrong decoding impl

* implement encode like for structures

* undo removal of old pending changes

* trailingzeroinput

* Apply suggestions from code review

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>
Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

* update codec

* fmt

* version is 1.0.0

* show more error

* fmt
This commit is contained in:
thiolliere
2019-08-06 19:36:23 +02:00
committed by Bastian Köcher
parent a0d442333f
commit 4ed67e03a4
211 changed files with 867 additions and 682 deletions
+2 -2
View File
@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
hex-literal = "0.2"
parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.93", optional = true }
inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
@@ -28,7 +28,7 @@ primitives = { package = "substrate-primitives", path = "../../core/primitives"
default = ["std"]
std = [
"serde",
"parity-codec/std",
"codec/std",
"rstd/std",
"srml-support/std",
"sr-primitives/std",
+4 -4
View File
@@ -28,7 +28,7 @@ use sr_primitives::{generic::DigestItem, ConsensusEngineId};
use sr_primitives::traits::{IsMember, SaturatedConversion, Saturating, RandomnessBeacon, Convert};
#[cfg(feature = "std")]
use timestamp::TimestampInherentData;
use parity_codec::{Encode, Decode};
use codec::{Encode, Decode};
use inherents::{RuntimeString, InherentIdentifier, InherentData, ProvideInherent, MakeFatalError};
#[cfg(feature = "std")]
use inherents::{InherentDataProviders, ProvideInherentData};
@@ -103,7 +103,7 @@ impl ProvideInherentData for InherentDataProvider {
}
fn error_to_string(&self, error: &[u8]) -> Option<String> {
RuntimeString::decode(&mut &error[..]).map(Into::into)
RuntimeString::decode(&mut &error[..]).map(Into::into).ok()
}
}
@@ -186,7 +186,7 @@ decl_module! {
.iter()
.filter_map(|s| s.as_pre_runtime())
.filter_map(|(id, mut data)| if id == BABE_ENGINE_ID {
RawBabePreDigest::decode(&mut data)
RawBabePreDigest::decode(&mut data).ok()
} else {
None
})
@@ -219,7 +219,7 @@ impl<T: Trait> FindAuthor<u32> for Module<T> {
{
for (id, mut data) in digests.into_iter() {
if id == BABE_ENGINE_ID {
return Some(RawBabePreDigest::decode(&mut data)?.authority_index);
return Some(RawBabePreDigest::decode(&mut data).ok()?.authority_index);
}
}
return None;