Skip to content

Commit

Permalink
fix: importing encoding traits
Browse files Browse the repository at this point in the history
  • Loading branch information
@clostao
clostao committed Nov 15, 2023
1 parent 90a1ceb commit 33439a0
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 32 deletions.
2 changes: 2 additions & 0 deletions node/src/eth.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ pub enum EthApi {
Txpool,
Debug,
Trace,
None,
}

impl FromStr for EthApi {
Expand All @@ -57,6 +58,7 @@ impl FromStr for EthApi {
"txpool" => Self::Txpool,
"debug" => Self::Debug,
"trace" => Self::Trace,
"none" => Self::None,
_ => {
return Err(format!(
"`{}` is not recognized as a supported Ethereum Api",
Expand Down
1 change: 0 additions & 1 deletion node/src/rpc/eth.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ where
io.merge(Trace::new(client.clone(), trace_requester, 20).into_rpc())?;
}
}
io.merge(Web3::new(client).into_rpc())?;
io.merge(tx_pool.into_rpc())?;

Ok(io)
Expand Down
4 changes: 2 additions & 2 deletions pallets/custom-balances/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
Expand All @@ -29,7 +29,7 @@ stbl-core-primitives ={ workspace = true, features = ["std"] }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
2 changes: 1 addition & 1 deletion pallets/custom-balances/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub mod pallet {

use core::marker::PhantomData;

use codec::MaxEncodedLen;
use parity_scale_codec::MaxEncodedLen;
use frame_support::traits::tokens::{DepositConsequence, WithdrawConsequence, Preservation, Provenance, Fortitude};
use frame_support::traits::{Imbalance, SameOrOther, TryDrop};
use frame_support::RuntimeDebug;
Expand Down
4 changes: 2 additions & 2 deletions pallets/dnt-fee-controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
Expand All @@ -30,7 +30,7 @@ pallet-evm = { workspace = true, features = ["std"]}
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/erc20-manager/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
Expand All @@ -28,7 +28,7 @@ pallet-timestamp = { workspace = true, features = ["std"] }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/fee-rewards-vault/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
Expand All @@ -19,7 +19,7 @@ stbl-tools = { workspace = true }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/root-controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }

[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/sponsored-transactions/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
hex = { workspace = true, default-features = false }
scale-info = { workspace = true }
sp-core = { workspace = true }
Expand Down Expand Up @@ -36,7 +36,7 @@ ethereum = { workspace = true, features = ["std"] }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/token-fee-controller/supported-tokens-manager/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
Expand All @@ -23,7 +23,7 @@ pallet-balances = { workspace = true, features = ["std"] }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/token-fee-controller/user-fee-selector/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
Expand All @@ -24,7 +24,7 @@ pallet-balances = { workspace = true, features = ["std"] }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/token-fee-controller/validator-fee-selector/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
Expand All @@ -28,7 +28,7 @@ fp-evm = { workspace = true }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
4 changes: 2 additions & 2 deletions pallets/upgrade-runtime-proposal/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
scale-info = { workspace = true }
syn = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
stbl-tools = { workspace = true }
log = { workspace = true }

Expand All @@ -33,7 +33,7 @@ std = [
'sp-core/std',
'sp-std/std',
'sp-runtime/std',
'codec/std',
'parity-scale-codec/std',
'log/std'
]
try-runtime = ['frame-support/try-runtime']
4 changes: 2 additions & 2 deletions pallets/validator-keys-controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }
sp-staking = { workspace = true }
log = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
frame-benchmarking = { workspace = true, optional = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
Expand All @@ -29,7 +29,7 @@ serde = { version = '1.0.126',features = ['derive'] }
default = ['std']
runtime-benchmarks = ['frame-benchmarking']
std = [
'codec/std',
'parity-scale-codec/std',
'frame-benchmarking/std',
'frame-support/std',
'frame-system/std',
Expand Down
4 changes: 2 additions & 2 deletions pallets/validator-set/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }
sp-staking = { workspace = true }
log = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
frame-benchmarking = { workspace = true, optional = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
Expand All @@ -28,7 +28,7 @@ serde = { version = '1.0.126',features = ['derive'] }
default = ['std']
runtime-benchmarks = ['frame-benchmarking']
std = [
'codec/std',
'parity-scale-codec/std',
'frame-benchmarking/std',
'frame-support/std',
'frame-system/std',
Expand Down
4 changes: 2 additions & 2 deletions pallets/zero-gas-transactions/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
codec = { workspace = true }
parity-scale-codec = { workspace = true }
hex = { workspace = true, default-features = false }
scale-info = { workspace = true }
sp-core = { workspace = true }
Expand Down Expand Up @@ -39,7 +39,7 @@ ethereum = { workspace = true, features = ["std"] }
[features]
default = ["std"]
std = [
"codec/std",
"parity-scale-codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
Expand Down
6 changes: 3 additions & 3 deletions test-utils/stability-tracing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]

[dependencies]
sp-std = { workspace = true }
codec = { default-features = false, features = ["derive"], workspace = true }
parity-scale-codec = { default-features = false, features = ["derive"], workspace = true }
tracing = { workspace = true }
tracing-core = { workspace = true }
tracing-subscriber = { workspace = true, optional = true }

[features]
default = ["std"]
with-tracing = ["codec/derive", "codec/full"]
with-tracing = ["parity-scale-codec/derive", "parity-scale-codec/full"]
std = [
"with-tracing",
"tracing/std",
"tracing-core/std",
"codec/std",
"parity-scale-codec/std",
"sp-std/std",
"tracing-subscriber",
]
2 changes: 1 addition & 1 deletion test-utils/stability-tracing/src/types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use codec::{Decode, Encode};
use parity_scale_codec::{Decode, Encode};
/// Types for wasm based tracing. Loosly inspired by `tracing-core` but
/// optimised for the specific use case.
use core::{fmt::Debug, format_args};
Expand Down

0 comments on commit 33439a0

Please sign in to comment.