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/network/src/config.rs

@@ -27,7 +27,6 @@ use crate::on_demand_layer::OnDemand;
 use crate::service::{ExHashT, TransactionPool};
 use bitflags::bitflags;
 use consensus::import_queue::ImportQueue;
-use parity_codec;
 use sr_primitives::traits::{Block as BlockT};
 use std::sync::Arc;
 use libp2p::identity::{Keypair, secp256k1, ed25519};
@@ -109,15 +108,17 @@ impl Roles {
 	}
 }
 
-impl parity_codec::Encode for Roles {
-	fn encode_to<T: parity_codec::Output>(&self, dest: &mut T) {
+impl codec::Encode for Roles {
+	fn encode_to<T: codec::Output>(&self, dest: &mut T) {
 		dest.push_byte(self.bits())
 	}
 }
 
-impl parity_codec::Decode for Roles {
-	fn decode<I: parity_codec::Input>(input: &mut I) -> Option<Self> {
-		Self::from_bits(input.read_byte()?)
+impl codec::EncodeLike for Roles {}
+
+impl codec::Decode for Roles {
+	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
+		Self::from_bits(input.read_byte()?).ok_or_else(|| codec::Error::from("Invalid bytes"))
 	}
 }
 

substrate/core/network/src/custom_proto/upgrade.rs

@@ -22,7 +22,7 @@ use libp2p::tokio_codec::Framed;
 use log::warn;
 use std::{collections::VecDeque, io, marker::PhantomData, vec::IntoIter as VecIntoIter};
 use futures::{prelude::*, future, stream};
-use parity_codec::{Decode, Encode};
+use codec::{Decode, Encode};
 use sr_primitives::traits::Block as BlockT;
 use tokio_io::{AsyncRead, AsyncWrite};
 use unsigned_varint::codec::UviBytes;
@@ -179,7 +179,7 @@ where TSubstream: AsyncRead + AsyncWrite, B: BlockT {
 				self.clogged_fuse = true;
 				return Ok(Async::Ready(Some(RegisteredProtocolEvent::Clogged {
 					messages: self.send_queue.iter()
-						.map(|m| Decode::decode(&mut &m[..]).ok_or(()))
+						.map(|m| Decode::decode(&mut &m[..]))
 						.filter_map(Result::ok)
 						.collect(),
 				})))
@@ -199,9 +199,12 @@ where TSubstream: AsyncRead + AsyncWrite, B: BlockT {
 		// Note that `inner` is wrapped in a `Fuse`, therefore we can poll it forever.
 		match self.inner.poll()? {
 			Async::Ready(Some(data)) => {
-				let message = <Message<B> as Decode>::decode(&mut &data[..]).ok_or(())
-					.map_err(|()| {
-						warn!(target: "sub-libp2p", "Couldn't decode packet sent by the remote: {:?}", data);
+				let message = <Message<B> as Decode>::decode(&mut &data[..])
+					.map_err(|err| {
+						warn!(
+							target: "sub-libp2p",
+							"Couldn't decode packet sent by the remote: {:?}: {}", data, err.what(),
+						);
 						io::ErrorKind::InvalidData
 					})?;
 				Ok(Async::Ready(Some(RegisteredProtocolEvent::Message(message))))

substrate/core/network/src/protocol/message.rs

@@ -18,7 +18,7 @@
 
 use bitflags::bitflags;
 use sr_primitives::{ConsensusEngineId, traits::{Block as BlockT, Header as HeaderT}};
-use parity_codec::{Encode, Decode, Input, Output};
+use codec::{Encode, Decode, Input, Output, Error};
 pub use self::generic::{
 	BlockAnnounce, RemoteCallRequest, RemoteReadRequest,
 	RemoteHeaderRequest, RemoteHeaderResponse,
@@ -90,9 +90,11 @@ impl Encode for BlockAttributes {
 	}
 }
 
+impl codec::EncodeLike for BlockAttributes {}
+
 impl Decode for BlockAttributes {
-	fn decode<I: Input>(input: &mut I) -> Option<Self> {
-		Self::from_bits(input.read_byte()?)
+	fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
+		Self::from_bits(input.read_byte()?).ok_or_else(|| Error::from("Invalid bytes"))
 	}
 }
 
@@ -125,7 +127,7 @@ pub struct RemoteReadResponse {
 
 /// Generic types.
 pub mod generic {
-	use parity_codec::{Encode, Decode};
+	use codec::{Encode, Decode};
 	use sr_primitives::Justification;
 	use crate::config::Roles;
 	use super::{