From fe86e8cada9d2ecf6c9a1af4ee5e1707f345c2f6 Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 19 Feb 2024 10:27:35 +0100 Subject: [PATCH] drop Ord/PartialOrd for types where it did not really make sense. Remove sccache ref in direnv, it did not speed up things. --- .envrc | 1 - .tarpaulin.toml | 2 +- src/core/types/hex_32bytes.rs | 2 -- src/core/types/signatures/ed25519_signature.rs | 2 -- src/core/types/signatures/secp256k1_signature.rs | 2 -- src/core/types/signatures/signature.rs | 2 -- src/profile/v100/app_preferences/p2p_links/p2p_link.rs | 2 -- .../v100/app_preferences/p2p_links/radix_connect_password.rs | 2 -- src/profile/v100/factors/factor_source_id_from_hash.rs | 2 -- 9 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.envrc b/.envrc index 35ee6a0f0..3c93cf0ac 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,2 @@ -export RUSTC_WRAPPER=/opt/homebrew/bin/sccache export JAVA_OPTS="-Xmx8g" export CLASSPATH=$PWD/jna-5.13.0.jar \ No newline at end of file diff --git a/.tarpaulin.toml b/.tarpaulin.toml index 9950c362f..e08d56888 100644 --- a/.tarpaulin.toml +++ b/.tarpaulin.toml @@ -1,7 +1,7 @@ [all] exclude-files = [ "tests/*", - "src/wrapped_radix_engine_toolkit/dummy_types.rs", + "src/wrapped_radix_engine_toolkit/*", "example/*", "target/*", "apple/*", diff --git a/src/core/types/hex_32bytes.rs b/src/core/types/hex_32bytes.rs index 1eef512c1..99975a5b0 100644 --- a/src/core/types/hex_32bytes.rs +++ b/src/core/types/hex_32bytes.rs @@ -11,8 +11,6 @@ macro_rules! decl_bag_of_n_bytes { Clone, PartialEq, Eq, - PartialOrd, - Ord, Hash, SerializeDisplay, DeserializeFromStr, diff --git a/src/core/types/signatures/ed25519_signature.rs b/src/core/types/signatures/ed25519_signature.rs index 92f8b937e..cc8d072fc 100644 --- a/src/core/types/signatures/ed25519_signature.rs +++ b/src/core/types/signatures/ed25519_signature.rs @@ -7,8 +7,6 @@ use radix_engine_common::crypto::Ed25519Signature as ScryptoEd25519Signature; Clone, PartialEq, Eq, - PartialOrd, - Ord, Hash, derive_more::Display, derive_more::Debug, diff --git a/src/core/types/signatures/secp256k1_signature.rs b/src/core/types/signatures/secp256k1_signature.rs index 9b68bf6cc..061890c08 100644 --- a/src/core/types/signatures/secp256k1_signature.rs +++ b/src/core/types/signatures/secp256k1_signature.rs @@ -7,8 +7,6 @@ use radix_engine_common::crypto::Secp256k1Signature as ScryptoSecp256k1Signature Clone, PartialEq, Eq, - PartialOrd, - Ord, Hash, derive_more::Display, derive_more::Debug, diff --git a/src/core/types/signatures/signature.rs b/src/core/types/signatures/signature.rs index a3b41738f..5c48c64b3 100644 --- a/src/core/types/signatures/signature.rs +++ b/src/core/types/signatures/signature.rs @@ -4,8 +4,6 @@ use crate::prelude::*; Clone, PartialEq, Eq, - PartialOrd, - Ord, Hash, EnumAsInner, derive_more::Display, diff --git a/src/profile/v100/app_preferences/p2p_links/p2p_link.rs b/src/profile/v100/app_preferences/p2p_links/p2p_link.rs index a14a560a8..e7fd59d47 100644 --- a/src/profile/v100/app_preferences/p2p_links/p2p_link.rs +++ b/src/profile/v100/app_preferences/p2p_links/p2p_link.rs @@ -11,8 +11,6 @@ use radix_engine_common::crypto::Hash; Clone, PartialEq, Eq, - Ord, - PartialOrd, Hash, derive_more::Debug, derive_more::Display, diff --git a/src/profile/v100/app_preferences/p2p_links/radix_connect_password.rs b/src/profile/v100/app_preferences/p2p_links/radix_connect_password.rs index e181bf3d7..134927e9f 100644 --- a/src/profile/v100/app_preferences/p2p_links/radix_connect_password.rs +++ b/src/profile/v100/app_preferences/p2p_links/radix_connect_password.rs @@ -10,8 +10,6 @@ use radix_engine_common::crypto::Hash; Clone, PartialEq, Eq, - PartialOrd, - Ord, Hash, derive_more::Display, derive_more::Debug, diff --git a/src/profile/v100/factors/factor_source_id_from_hash.rs b/src/profile/v100/factors/factor_source_id_from_hash.rs index 1be118b8f..94d5d814f 100644 --- a/src/profile/v100/factors/factor_source_id_from_hash.rs +++ b/src/profile/v100/factors/factor_source_id_from_hash.rs @@ -9,8 +9,6 @@ use radix_engine_common::crypto::{blake2b_256_hash, Hash}; Clone, PartialEq, Eq, - PartialOrd, - Ord, Hash, derive_more::Display, derive_more::Debug,