Update rlp to v0.5.2 (#45)

* Update rlp to v0.5.2

* Fix fmt

Signed-off-by: koushiro <[email protected]>

Signed-off-by: koushiro <[email protected]>

Author: koushiro

Cargo.toml

@@ -13,8 +13,7 @@ bytes = { version = "1.0", default-features = false }
 ethereum-types = { version = "0.13.1", default-features = false, features = ["rlp", "codec"] }
 hash-db = { version = "0.15", default-features = false }
 hash256-std-hasher = { version = "0.15", default-features = false }
-rlp = { version = "0.5", default-features = false }
-rlp-derive = "0.1"
+rlp = { version = "0.5.2", default-features = false, features = ["derive"] }
 sha3 = { version = "0.10", default-features = false }
 triehash = { version = "0.8", default-features = false }
 
@@ -42,6 +41,3 @@ std = [
     "sha3/std",
     "triehash/std",
 ]
-
-[workspace]
-members = []

rustfmt.toml

@@ -1 +1,2 @@
-hard_tabs = true
+hard_tabs = true
+merge_derives = false

src/account.rs

@@ -1,7 +1,7 @@
 use ethereum_types::{H256, U256};
-use rlp_derive::{RlpDecodable, RlpEncodable};
 
-#[derive(Clone, Debug, PartialEq, Eq, RlpEncodable, RlpDecodable)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
 #[cfg_attr(feature = "with-codec", derive(codec::Encode, codec::Decode))]
 #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Account {

src/header.rs

@@ -1,10 +1,10 @@
 use ethereum_types::{Bloom, H160, H256, H64, U256};
-use rlp_derive::{RlpDecodable, RlpEncodable};
 use sha3::{Digest, Keccak256};
 
 use crate::Bytes;
 
-#[derive(Clone, Debug, PartialEq, Eq, RlpEncodable, RlpDecodable)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
 #[cfg_attr(
 	feature = "with-codec",
 	derive(codec::Encode, codec::Decode, scale_info::TypeInfo)

src/log.rs

@@ -1,9 +1,9 @@
 use crate::Bytes;
 use alloc::vec::Vec;
 use ethereum_types::{H160, H256};
-use rlp_derive::{RlpDecodable, RlpEncodable};
 
-#[derive(Clone, Debug, PartialEq, Eq, RlpEncodable, RlpDecodable)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
 #[cfg_attr(
 	feature = "with-codec",
 	derive(codec::Encode, codec::Decode, scale_info::TypeInfo)

src/receipt.rs

@@ -3,9 +3,9 @@ use alloc::vec::Vec;
 use bytes::BytesMut;
 use ethereum_types::{Bloom, H256, U256};
 use rlp::{Decodable, DecoderError, Rlp};
-use rlp_derive::{RlpDecodable, RlpEncodable};
 
-#[derive(Clone, Debug, PartialEq, Eq, RlpEncodable, RlpDecodable)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
 #[cfg_attr(
 	feature = "with-codec",
 	derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
@@ -18,7 +18,8 @@ pub struct FrontierReceiptData {
 	pub logs: Vec<Log>,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, RlpEncodable, RlpDecodable)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
 #[cfg_attr(
 	feature = "with-codec",
 	derive(codec::Encode, codec::Decode, scale_info::TypeInfo)

src/util.rs

@@ -6,7 +6,7 @@ use hash_db::Hasher;
 use sha3::{Digest, Keccak256};
 
 /// Concrete `Hasher` impl for the Keccak-256 hash
-#[derive(Default, Debug, Clone, PartialEq)]
+#[derive(Default, Debug, Clone, PartialEq, Eq)]
 pub struct KeccakHasher;
 impl Hasher for KeccakHasher {
 	type Out = H256;