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

substrate/core/state-machine/src/changes_trie/build.rs

@@ -18,7 +18,7 @@
 
 use std::collections::BTreeMap;
 use std::collections::btree_map::Entry;
-use parity_codec::Decode;
+use codec::Decode;
 use hash_db::Hasher;
 use num_traits::One;
 use crate::backend::Backend;
@@ -156,13 +156,13 @@ fn prepare_digest_input<'a, S, H, Number>(
 
 			let extrinsic_prefix = ExtrinsicIndex::key_neutral_prefix(digest_build_block.clone());
 			trie_storage.for_keys_with_prefix(&extrinsic_prefix, |key|
-				if let Some(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
+				if let Ok(InputKey::ExtrinsicIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
 					insert_to_map(trie_key.key);
 				});
 
 			let digest_prefix = DigestIndex::key_neutral_prefix(digest_build_block.clone());
 			trie_storage.for_keys_with_prefix(&digest_prefix, |key|
-				if let Some(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
+				if let Ok(InputKey::DigestIndex::<Number>(trie_key)) = Decode::decode(&mut &key[..]) {
 					insert_to_map(trie_key.key);
 				});
 
@@ -173,7 +173,7 @@ fn prepare_digest_input<'a, S, H, Number>(
 
 #[cfg(test)]
 mod test {
-	use parity_codec::Encode;
+	use codec::Encode;
 	use primitives::Blake2Hasher;
 	use primitives::storage::well_known_keys::EXTRINSIC_INDEX;
 	use crate::backend::InMemory;

substrate/core/state-machine/src/changes_trie/changes_iterator.rs

@@ -19,7 +19,7 @@
 
 use std::cell::RefCell;
 use std::collections::VecDeque;
-use parity_codec::{Decode, Encode};
+use codec::{Decode, Encode};
 use hash_db::{HashDB, Hasher, EMPTY_PREFIX};
 use num_traits::One;
 use trie::{Recorder, MemoryDB};
@@ -249,8 +249,7 @@ impl<'a, RS, S, H, Number> DrilldownIteratorEssence<'a, RS, S, H, Number>
 					let extrinsics_key = ExtrinsicIndex { block: block.clone(), key: self.key.to_vec() }.encode();
 					let extrinsics = trie_reader(&self.storage, trie_root, &extrinsics_key);
 					if let Some(extrinsics) = extrinsics? {
-						let extrinsics: Option<ExtrinsicIndexValue> = Decode::decode(&mut &extrinsics[..]);
-						if let Some(extrinsics) = extrinsics {
+						if let Ok(extrinsics) = ExtrinsicIndexValue::decode(&mut &extrinsics[..]) {
 							self.extrinsics.extend(extrinsics.into_iter().rev().map(|e| (block.clone(), e)));
 						}
 					}
@@ -259,8 +258,7 @@ impl<'a, RS, S, H, Number> DrilldownIteratorEssence<'a, RS, S, H, Number>
 				let blocks_key = DigestIndex { block: block.clone(), key: self.key.to_vec() }.encode();
 				let blocks = trie_reader(&self.storage, trie_root, &blocks_key);
 				if let Some(blocks) = blocks? {
-					let blocks: Option<DigestIndexValue<Number>> = Decode::decode(&mut &blocks[..]);
-					if let Some(blocks) = blocks {
+					if let Ok(blocks) = <DigestIndexValue<Number>>::decode(&mut &blocks[..]) {
 						// filter level0 blocks here because we tend to use digest blocks,
 						// AND digest block changes could also include changes for out-of-range blocks
 						let begin = self.begin.clone();

substrate/core/state-machine/src/changes_trie/input.rs

@@ -16,7 +16,7 @@
 
 //! Different types of changes trie input pairs.
 
-use parity_codec::{Decode, Encode, Input, Output};
+use codec::{Decode, Encode, Input, Output, Error};
 use crate::changes_trie::BlockNumber;
 
 /// Key of { changed key => set of extrinsic indices } mapping.
@@ -95,6 +95,8 @@ impl<Number: BlockNumber> Encode for ExtrinsicIndex<Number> {
 	}
 }
 
+impl<Number: BlockNumber> codec::EncodeLike for ExtrinsicIndex<Number> {}
+
 impl<Number: BlockNumber> DigestIndex<Number> {
 	pub fn key_neutral_prefix(block: Number) -> Vec<u8> {
 		let mut prefix = vec![2];
@@ -112,18 +114,20 @@ impl<Number: BlockNumber> Encode for DigestIndex<Number> {
 	}
 }
 
+impl<Number: BlockNumber> codec::EncodeLike for DigestIndex<Number> {}
+
 impl<Number: BlockNumber> Decode for InputKey<Number> {
-	fn decode<I: Input>(input: &mut I) -> Option<Self> {
+	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
 		match input.read_byte()? {
-			1 => Some(InputKey::ExtrinsicIndex(ExtrinsicIndex {
+			1 => Ok(InputKey::ExtrinsicIndex(ExtrinsicIndex {
 				block: Decode::decode(input)?,
 				key: Decode::decode(input)?,
 			})),
-			2 => Some(InputKey::DigestIndex(DigestIndex {
+			2 => Ok(InputKey::DigestIndex(DigestIndex {
 				block: Decode::decode(input)?,
 				key: Decode::decode(input)?,
 			})),
-			_ => None,
+			_ => Err("Invalid input key variant".into()),
 		}
 	}
 }

substrate/core/state-machine/src/changes_trie/mod.rs

@@ -49,7 +49,7 @@ pub use self::prune::{prune, oldest_non_pruned_trie};
 use hash_db::{Hasher, Prefix};
 use crate::backend::Backend;
 use num_traits::{One, Zero};
-use parity_codec::{Decode, Encode};
+use codec::{Decode, Encode};
 use primitives;
 use crate::changes_trie::build::prepare_input;
 use crate::overlayed_changes::OverlayedChanges;

substrate/core/state-machine/src/ext.rs

@@ -338,7 +338,7 @@ where
 #[cfg(test)]
 mod tests {
 	use hex_literal::hex;
-	use parity_codec::Encode;
+	use codec::Encode;
 	use primitives::{Blake2Hasher};
 	use primitives::storage::well_known_keys::EXTRINSIC_INDEX;
 	use crate::backend::InMemory;

substrate/core/state-machine/src/lib.rs

@@ -22,7 +22,7 @@ use std::{fmt, panic::UnwindSafe, result, marker::PhantomData};
 use std::borrow::Cow;
 use log::warn;
 use hash_db::Hasher;
-use parity_codec::{Decode, Encode};
+use codec::{Decode, Encode};
 use primitives::{
 	storage::well_known_keys, NativeOrEncoded, NeverNativeValue, offchain,
 };
@@ -938,7 +938,7 @@ pub(crate) fn set_changes_trie_config(
 ) -> Result<(), Box<dyn Error>> {
 	let config = match config {
 		Some(v) => Some(Decode::decode(&mut &v[..])
-			.ok_or_else(|| Box::new("Failed to decode changes trie configuration".to_owned()) as Box<dyn Error>)?),
+			.map_err(|_| Box::new("Failed to decode changes trie configuration".to_owned()) as Box<dyn Error>)?),
 		None => None,
 	};
 
@@ -972,7 +972,7 @@ where
 #[cfg(test)]
 mod tests {
 	use std::collections::HashMap;
-	use parity_codec::Encode;
+	use codec::Encode;
 	use overlayed_changes::OverlayedValue;
 	use super::*;
 	use super::backend::InMemory;

substrate/core/state-machine/src/overlayed_changes.rs

@@ -18,7 +18,7 @@
 
 #[cfg(test)] use std::iter::FromIterator;
 use std::collections::{HashMap, BTreeSet};
-use parity_codec::Decode;
+use codec::Decode;
 use crate::changes_trie::{NO_EXTRINSIC_INDEX, Configuration as ChangesTrieConfig};
 use primitives::storage::well_known_keys::EXTRINSIC_INDEX;
 
@@ -267,7 +267,7 @@ impl OverlayedChanges {
 	/// Inserts storage entry responsible for current extrinsic index.
 	#[cfg(test)]
 	pub(crate) fn set_extrinsic_index(&mut self, extrinsic_index: u32) {
-		use parity_codec::Encode;
+		use codec::Encode;
 		self.prospective.top.insert(EXTRINSIC_INDEX.to_vec(), OverlayedValue {
 			value: Some(extrinsic_index.encode()),
 			extrinsics: None,
@@ -284,7 +284,7 @@ impl OverlayedChanges {
 		match self.changes_trie_config.is_some() {
 			true => Some(
 				self.storage(EXTRINSIC_INDEX)
-					.and_then(|idx| idx.and_then(|idx| Decode::decode(&mut &*idx)))
+					.and_then(|idx| idx.and_then(|idx| Decode::decode(&mut &*idx).ok()))
 					.unwrap_or(NO_EXTRINSIC_INDEX)),
 			false => None,
 		}

substrate/core/state-machine/src/testing.rs

@@ -27,7 +27,7 @@ use crate::changes_trie::{
 };
 use primitives::offchain;
 use primitives::storage::well_known_keys::{CHANGES_TRIE_CONFIG, CODE, HEAP_PAGES};
-use parity_codec::Encode;
+use codec::Encode;
 use super::{ChildStorageKey, Externalities, OverlayedChanges};
 
 const EXT_NOT_ALLOWED_TO_FAIL: &str = "Externalities not allowed to fail within runtime";

substrate/core/state-machine/src/trie_backend.rs

@@ -194,9 +194,8 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
 pub mod tests {
 	use std::collections::HashSet;
 	use primitives::{Blake2Hasher, H256};
-	use parity_codec::Encode;
-	use trie::{TrieMut, PrefixedMemoryDB};
-	use trie::trie_types::TrieDBMut;
+	use codec::Encode;
+	use trie::{TrieMut, PrefixedMemoryDB, trie_types::TrieDBMut};
 	use super::*;
 
 	fn test_db() -> (PrefixedMemoryDB<Blake2Hasher>, H256) {