diff --git a/core/src/utils/mod.rs b/core/src/utils/mod.rs index c04aafcdb0..006864dd64 100644 --- a/core/src/utils/mod.rs +++ b/core/src/utils/mod.rs @@ -4,6 +4,12 @@ //! Miscellaneous utility helpers. +use crate::prelude::*; +use borrow::ToOwned; +use codec::{Compact, Decode, Encode}; +use derivative::Derivative; +use vec::Vec; + mod account_id; pub mod bits; mod era; @@ -13,17 +19,12 @@ mod static_type; mod unchecked_extrinsic; mod wrapper_opaque; -use codec::{Compact, Decode, Encode}; -use derivative::Derivative; - pub use account_id::AccountId32; -use borrow::ToOwned; pub use era::Era; pub use multi_address::MultiAddress; pub use multi_signature::MultiSignature; pub use static_type::Static; pub use unchecked_extrinsic::UncheckedExtrinsic; -use vec::Vec; pub use wrapper_opaque::WrapperKeepOpaque; // Used in codegen @@ -49,8 +50,6 @@ pub(crate) fn strip_compact_prefix(bytes: &[u8]) -> Result<(u64, &[u8]), codec:: Ok((val.0, *cursor)) } -use crate::prelude::*; - /// A version of [`core::marker::PhantomData`] that is also Send and Sync (which is fine /// because regardless of the generic param, it is always possible to Send + Sync this /// 0 size type). diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml index 6f6b664a0f..b53cf79f0b 100644 --- a/subxt/Cargo.toml +++ b/subxt/Cargo.toml @@ -51,11 +51,11 @@ unstable-light-client = ["subxt-lightclient", "tokio-stream"] [dependencies] async-trait = { workspace = true } codec = { package = "parity-scale-codec", workspace = true, features = ["derive"] } -scale-info = { workspace = true } -scale-value = { workspace = true } -scale-bits = { workspace = true } -scale-decode = { workspace = true } -scale-encode = { workspace = true } +scale-info = { workspace = true, features = ["default"] } +scale-value = { workspace = true, features = ["default"] } +scale-bits = { workspace = true, features = ["default"] } +scale-decode = { workspace = true, features = ["default"] } +scale-encode = { workspace = true, features = ["default"] } futures = { workspace = true } hex = { workspace = true } serde = { workspace = true, features = ["derive"] } @@ -69,7 +69,7 @@ instant = { workspace = true } # Provides some deserialization, types like U256/H256 and hashing impls like twox/blake256: impl-serde = { workspace = true } -primitive-types = { workspace = true } +primitive-types = { workspace = true, features = ["codec", "scale-info", "serde"] } sp-core-hashing = { workspace = true } # For ss58 encoding AccountId32 to serialize them properly: diff --git a/testing/no-std-tests/src/main.rs b/testing/no-std-tests/src/main.rs index 2ca5d22f5e..65f425028f 100644 --- a/testing/no-std-tests/src/main.rs +++ b/testing/no-std-tests/src/main.rs @@ -49,6 +49,5 @@ fn subxt_metadata_test() { } fn subxt_core_test() { - // let er - // assert!(subxt_core::utils::url_is_secure(url).unwrap()); + let era = subxt_core::utils::era::Era::Immortal; }