diff --git a/core/src/constants/constant_address.rs b/core/src/constants/constant_address.rs index bdd1782d35..7fb543e276 100644 --- a/core/src/constants/constant_address.rs +++ b/core/src/constants/constant_address.rs @@ -46,7 +46,7 @@ pub struct Address { // Manual implementation to work around https://github.com/mcarton/rust-derivative/issues/115. impl PartialOrd for Address { - fn partial_cmp(&self, other: &Self) -> Option { + fn partial_cmp(&self, other: &Self) -> Option { Some(self.cmp(other)) } } diff --git a/core/src/runtime_api/mod.rs b/core/src/runtime_api/mod.rs index 721f59f6a8..80f9475f2b 100644 --- a/core/src/runtime_api/mod.rs +++ b/core/src/runtime_api/mod.rs @@ -74,11 +74,11 @@ pub trait RuntimeApiPayload { #[derive(Derivative)] #[derivative( Clone(bound = "ArgsData: Clone"), - Debug(bound = "ArgsData: std::fmt::Debug"), - Eq(bound = "ArgsData: std::cmp::Eq"), - Ord(bound = "ArgsData: std::cmp::Ord"), - PartialEq(bound = "ArgsData: std::cmp::PartialEq"), - PartialOrd(bound = "ArgsData: std::cmp::PartialOrd") + Debug(bound = "ArgsData: core::fmt::Debug"), + Eq(bound = "ArgsData: core::cmp::Eq"), + Ord(bound = "ArgsData: core::cmp::Ord"), + PartialEq(bound = "ArgsData: core::cmp::PartialEq"), + PartialOrd(bound = "ArgsData: core::cmp::PartialOrd") )] pub struct Payload { trait_name: Cow<'static, str>, diff --git a/core/src/storage/storage_address.rs b/core/src/storage/storage_address.rs index c3749a8e36..9f0e23355c 100644 --- a/core/src/storage/storage_address.rs +++ b/core/src/storage/storage_address.rs @@ -58,11 +58,11 @@ pub trait StorageAddress { #[derive(Derivative)] #[derivative( Clone(bound = "StorageKey: Clone"), - Debug(bound = "StorageKey: std::fmt::Debug"), - Eq(bound = "StorageKey: std::cmp::Eq"), - Ord(bound = "StorageKey: std::cmp::Ord"), - PartialEq(bound = "StorageKey: std::cmp::PartialEq"), - PartialOrd(bound = "StorageKey: std::cmp::PartialOrd") + Debug(bound = "StorageKey: core::fmt::Debug"), + Eq(bound = "StorageKey: core::cmp::Eq"), + Ord(bound = "StorageKey: core::cmp::Ord"), + PartialEq(bound = "StorageKey: core::cmp::PartialEq"), + PartialOrd(bound = "StorageKey: core::cmp::PartialOrd") )] pub struct Address { pallet_name: Cow<'static, str>, diff --git a/core/src/tx/mod.rs b/core/src/tx/mod.rs index 8ba13d116e..de2f45b64a 100644 --- a/core/src/tx/mod.rs +++ b/core/src/tx/mod.rs @@ -54,11 +54,11 @@ pub struct ValidationDetails<'a> { #[derive(Derivative)] #[derivative( Clone(bound = "CallData: Clone"), - Debug(bound = "CallData: std::fmt::Debug"), - Eq(bound = "CallData: std::cmp::Eq"), - Ord(bound = "CallData: std::cmp::Ord"), - PartialEq(bound = "CallData: std::cmp::PartialEq"), - PartialOrd(bound = "CallData: std::cmp::PartialOrd") + Debug(bound = "CallData: core::fmt::Debug"), + Eq(bound = "CallData: core::cmp::Eq"), + Ord(bound = "CallData: core::cmp::Ord"), + PartialEq(bound = "CallData: core::cmp::PartialEq"), + PartialOrd(bound = "CallData: core::cmp::PartialOrd") )] pub struct Payload { pallet_name: Cow<'static, str>, diff --git a/signer/Cargo.toml b/signer/Cargo.toml index 9efd2e1ca7..c9650e0db5 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -45,7 +45,7 @@ pbkdf2 = { workspace = true, default-features = false } sha2 = { workspace = true, default-features = false } hmac = { workspace = true, default-features = false } zeroize = { workspace = true } -bip39 = { workspace = true, default-features = false, features = ["unicode-normalization"] } +bip39 = { workspace = true, default-features = false } schnorrkel = { workspace = true, optional = true, default-features = false } secp256k1 = { workspace = true, optional = true, default-features = false, features = ["alloc", "recovery"] } # features = ["recovery", "global-context"], secrecy = { workspace = true } diff --git a/testing/no-std-tests/Cargo.lock b/testing/no-std-tests/Cargo.lock index e2703c0f6d..ef41c29755 100644 --- a/testing/no-std-tests/Cargo.lock +++ b/testing/no-std-tests/Cargo.lock @@ -45,7 +45,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", - "unicode-normalization", ] [[package]] @@ -143,12 +142,6 @@ dependencies = [ "libc", ] -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - [[package]] name = "crunchy" version = "0.2.2" @@ -265,9 +258,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "equivalent" @@ -463,10 +456,6 @@ name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -dependencies = [ - "critical-section", - "portable-atomic", -] [[package]] name = "parity-scale-codec" @@ -507,12 +496,6 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - [[package]] name = "primitive-types" version = "0.12.2" @@ -895,7 +878,6 @@ version = "0.0.0" dependencies = [ "libc_alloc", "parity-scale-codec", - "subxt-core", "subxt-metadata", "subxt-signer", ] @@ -917,10 +899,10 @@ name = "subxt-signer" version = "0.34.0" dependencies = [ "bip39", + "cfg-if", "derive_more", "hex", "hmac", - "once_cell", "parity-scale-codec", "pbkdf2", "regex", @@ -961,21 +943,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml_datetime" version = "0.6.3" @@ -1039,15 +1006,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "version_check" version = "0.9.4" diff --git a/testing/no-std-tests/Cargo.toml b/testing/no-std-tests/Cargo.toml index b336627c8f..8d021bd817 100644 --- a/testing/no-std-tests/Cargo.toml +++ b/testing/no-std-tests/Cargo.toml @@ -8,7 +8,7 @@ resolver = "2" [dependencies] subxt-metadata = { path = "../../metadata", default-features = false } subxt-signer = { path = "../../signer", default-features = false, features = ["sr25519", "ecdsa", "subxt"] } -subxt-core = { path = "../../core", default-features = false } +# subxt-core = { path = "../../core", default-features = false } codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive"] } libc_alloc = { version = "1.0.6" } diff --git a/testing/no-std-tests/src/main.rs b/testing/no-std-tests/src/main.rs index ae1860f311..4f5b1b377c 100644 --- a/testing/no-std-tests/src/main.rs +++ b/testing/no-std-tests/src/main.rs @@ -19,9 +19,7 @@ pub extern "C" fn rust_eh_personality() {} #[panic_handler] fn panic(_info: &core::panic::PanicInfo) -> ! { - unsafe { - libc::abort(); - } + loop {} } use libc_alloc::LibcAlloc; @@ -60,5 +58,5 @@ fn test() { // subxt-core // ///////////////////////////////////////////////////////////////////////////// - let _era = subxt_core::utils::Era::Immortal; + // let _era = subxt_core::utils::Era::Immortal; }