Skip to content

Commit b160820

Browse files
koushirokoushiro
authored
chore: rename feature with-codec => with-scale (#56)
1 parent 1fe20e2 commit b160820

File tree

11 files changed

+55
-60
lines changed

11 files changed

+55
-60
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions-rs/cargo@v1
3535
with:
3636
command: build
37-
args: --all --release
37+
args: --all --release --all-features
3838
- uses: actions-rs/cargo@v1
3939
with:
4040
command: build

‎Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rlp = { version = "0.5.2", default-features = false, features = ["derive"] }
1717
sha3 = { version = "0.10", default-features = false }
1818
trie-root = { version = "0.18", default-features = false }
1919

20-
codec = { package = "parity-scale-codec", version = "3.2", default-features = false, features = ["derive"], optional = true }
20+
scale-codec = { package = "parity-scale-codec", version = "3.2", default-features = false, features = ["derive"], optional = true }
2121
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
2222
serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
2323

@@ -29,17 +29,17 @@ triehash = "0.8.4"
2929

3030
[features]
3131
default = ["std"]
32-
with-codec = ["codec", "scale-info", "ethereum-types/codec"]
32+
with-scale = ["scale-codec", "scale-info", "ethereum-types/codec"]
3333
with-serde = ["serde", "ethereum-types/serialize"]
3434
std = [
3535
"bytes/std",
36-
"codec/std",
3736
"ethereum-types/std",
3837
"hash-db/std",
3938
"hash256-std-hasher/std",
4039
"rlp/std",
41-
"scale-info/std",
42-
"serde/std",
4340
"sha3/std",
4441
"trie-root/std",
42+
"scale-codec?/std",
43+
"scale-info?/std",
44+
"serde?/std",
4545
]

‎src/account.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ use ethereum_types::{H256, U256};
22

33
#[derive(Clone, Debug, PartialEq, Eq)]
44
#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
5-
#[cfg_attr(feature = "with-codec", derive(codec::Encode, codec::Decode))]
5+
#[cfg_attr(
6+
feature = "with-scale",
7+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
8+
)]
69
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
710
pub struct Account {
811
pub nonce: U256,

‎src/block.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ use crate::{
1313

1414
#[derive(Clone, Debug, PartialEq, Eq)]
1515
#[cfg_attr(
16-
feature = "with-codec",
17-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
16+
feature = "with-scale",
17+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
1818
)]
1919
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
2020
pub struct Block<T> {

‎src/header.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ use sha3::{Digest, Keccak256};
33

44
use crate::Bytes;
55

6+
/// Ethereum header definition.
67
#[derive(Clone, Debug, PartialEq, Eq)]
78
#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
89
#[cfg_attr(
9-
feature = "with-codec",
10-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
10+
feature = "with-scale",
11+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
1112
)]
1213
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
13-
/// Ethereum header definition.
1414
pub struct Header {
1515
pub parent_hash: H256,
1616
pub ommers_hash: H256,
@@ -57,8 +57,8 @@ impl Header {
5757
}
5858
}
5959

60-
#[derive(Clone, Debug, PartialEq, Eq)]
6160
/// Partial header definition without ommers hash and transactions root.
61+
#[derive(Clone, Debug, PartialEq, Eq)]
6262
pub struct PartialHeader {
6363
pub parent_hash: H256,
6464
pub beneficiary: H160,

‎src/log.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use crate::Bytes;
77
#[derive(Clone, Debug, PartialEq, Eq)]
88
#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
99
#[cfg_attr(
10-
feature = "with-codec",
11-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
10+
feature = "with-scale",
11+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
1212
)]
1313
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
1414
pub struct Log {

‎src/receipt.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ use crate::{
1212
#[derive(Clone, Debug, PartialEq, Eq)]
1313
#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
1414
#[cfg_attr(
15-
feature = "with-codec",
16-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
15+
feature = "with-scale",
16+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
1717
)]
1818
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
1919
pub struct FrontierReceiptData {
@@ -26,8 +26,8 @@ pub struct FrontierReceiptData {
2626
#[derive(Clone, Debug, PartialEq, Eq)]
2727
#[derive(rlp::RlpEncodable, rlp::RlpDecodable)]
2828
#[cfg_attr(
29-
feature = "with-codec",
30-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
29+
feature = "with-scale",
30+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
3131
)]
3232
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
3333
pub struct EIP658ReceiptData {
@@ -81,8 +81,8 @@ impl EnvelopedDecodable for ReceiptV1 {
8181

8282
#[derive(Clone, Debug, PartialEq, Eq)]
8383
#[cfg_attr(
84-
feature = "with-codec",
85-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
84+
feature = "with-scale",
85+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
8686
)]
8787
#[cfg_attr(
8888
feature = "with-serde",
@@ -148,8 +148,8 @@ impl From<ReceiptV2> for EIP658ReceiptData {
148148

149149
#[derive(Clone, Debug, PartialEq, Eq)]
150150
#[cfg_attr(
151-
feature = "with-codec",
152-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
151+
feature = "with-scale",
152+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
153153
)]
154154
#[cfg_attr(
155155
feature = "with-serde",
@@ -224,8 +224,8 @@ impl From<ReceiptV3> for EIP658ReceiptData {
224224

225225
#[derive(Clone, Debug, PartialEq, Eq)]
226226
#[cfg_attr(
227-
feature = "with-codec",
228-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
227+
feature = "with-scale",
228+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
229229
)]
230230
#[cfg_attr(
231231
feature = "with-serde",

‎src/transaction/eip1559.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use crate::{
99

1010
#[derive(Clone, Debug, PartialEq, Eq)]
1111
#[cfg_attr(
12-
feature = "with-codec",
13-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
12+
feature = "with-scale",
13+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
1414
)]
1515
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
1616
pub struct EIP1559Transaction {

‎src/transaction/eip2930.rs

+5-9
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ use crate::{transaction::TransactionAction, Bytes};
88

99
#[derive(Clone, Debug, PartialEq, Eq)]
1010
#[cfg_attr(
11-
feature = "with-codec",
12-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
13-
)]
14-
#[cfg_attr(
15-
feature = "with-serde",
16-
derive(serde::Serialize, serde::Deserialize),
17-
serde(rename_all = "camelCase")
11+
feature = "with-scale",
12+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
1813
)]
14+
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
1915
pub struct AccessListItem {
2016
pub address: Address,
2117
pub storage_keys: Vec<H256>,
@@ -42,8 +38,8 @@ pub type AccessList = Vec<AccessListItem>;
4238

4339
#[derive(Clone, Debug, PartialEq, Eq)]
4440
#[cfg_attr(
45-
feature = "with-codec",
46-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
41+
feature = "with-scale",
42+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
4743
)]
4844
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
4945
pub struct EIP2930Transaction {

‎src/transaction/legacy.rs

+16-20
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use crate::Bytes;
88

99
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
1010
#[cfg_attr(
11-
feature = "with-codec",
12-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
11+
feature = "with-scale",
12+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
1313
)]
1414
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
1515
pub enum TransactionAction {
@@ -44,8 +44,8 @@ impl rlp::Decodable for TransactionAction {
4444

4545
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
4646
#[cfg_attr(
47-
feature = "with-codec",
48-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
47+
feature = "with-scale",
48+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
4949
)]
5050
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
5151
pub struct TransactionRecoveryId(pub u64);
@@ -77,7 +77,7 @@ impl TransactionRecoveryId {
7777
}
7878

7979
#[derive(Clone, Debug, PartialEq, Eq)]
80-
#[cfg_attr(feature = "with-codec", derive(scale_info::TypeInfo))]
80+
#[cfg_attr(feature = "with-scale", derive(scale_info::TypeInfo))]
8181
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
8282
pub struct TransactionSignature {
8383
v: TransactionRecoveryId,
@@ -146,32 +146,32 @@ impl TransactionSignature {
146146
}
147147
}
148148

149-
#[cfg(feature = "codec")]
150-
impl codec::Encode for TransactionSignature {
149+
#[cfg(feature = "with-scale")]
150+
impl scale_codec::Encode for TransactionSignature {
151151
fn size_hint(&self) -> usize {
152-
codec::Encode::size_hint(&(self.v.0, self.r, self.s))
152+
scale_codec::Encode::size_hint(&(self.v.0, self.r, self.s))
153153
}
154154

155155
fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
156-
codec::Encode::using_encoded(&(self.v.0, self.r, self.s), f)
156+
scale_codec::Encode::using_encoded(&(self.v.0, self.r, self.s), f)
157157
}
158158
}
159159

160-
#[cfg(feature = "codec")]
161-
impl codec::Decode for TransactionSignature {
162-
fn decode<I: codec::Input>(value: &mut I) -> Result<Self, codec::Error> {
163-
let (v, r, s) = codec::Decode::decode(value)?;
160+
#[cfg(feature = "with-scale")]
161+
impl scale_codec::Decode for TransactionSignature {
162+
fn decode<I: scale_codec::Input>(value: &mut I) -> Result<Self, scale_codec::Error> {
163+
let (v, r, s) = scale_codec::Decode::decode(value)?;
164164
match Self::new(v, r, s) {
165165
Some(signature) => Ok(signature),
166-
None => Err(codec::Error::from("Invalid signature")),
166+
None => Err(scale_codec::Error::from("Invalid signature")),
167167
}
168168
}
169169
}
170170

171171
#[derive(Clone, Debug, PartialEq, Eq)]
172172
#[cfg_attr(
173-
feature = "with-codec",
174-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
173+
feature = "with-scale",
174+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
175175
)]
176176
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
177177
pub struct LegacyTransaction {
@@ -250,10 +250,6 @@ impl rlp::Decodable for LegacyTransaction {
250250
}
251251

252252
#[derive(Clone, Debug, PartialEq, Eq)]
253-
#[cfg_attr(
254-
feature = "with-codec",
255-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
256-
)]
257253
pub struct LegacyTransactionMessage {
258254
pub nonce: U256,
259255
pub gas_price: U256,

‎src/transaction/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ impl EnvelopedDecodable for TransactionV0 {
3737

3838
#[derive(Clone, Debug, PartialEq, Eq)]
3939
#[cfg_attr(
40-
feature = "with-codec",
41-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
40+
feature = "with-scale",
41+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
4242
)]
4343
#[cfg_attr(
4444
feature = "with-serde",
@@ -104,8 +104,8 @@ impl EnvelopedDecodable for TransactionV1 {
104104

105105
#[derive(Clone, Debug, PartialEq, Eq)]
106106
#[cfg_attr(
107-
feature = "with-codec",
108-
derive(codec::Encode, codec::Decode, scale_info::TypeInfo)
107+
feature = "with-scale",
108+
derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
109109
)]
110110
#[cfg_attr(
111111
feature = "with-serde",

0 commit comments

Comments
 (0)