scrypto 1.3.0

redstone-finance · Nov 28, 2024 · 720f854 · 720f854
1 parent 4dbc84a
commit 720f854
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 40 deletions.
diff --git a/src/core/aggregator.rs b/src/core/aggregator.rs
@@ -76,8 +76,7 @@ mod aggregate_matrix_tests {
         core::{aggregator::aggregate_matrix, config::Config},
         helpers::iter_into::{IterInto, IterIntoOpt, OptIterIntoOpt},
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 
@@ -157,8 +156,7 @@ mod make_value_signer_matrix {
         network::specific::U256,
         protocol::data_package::DataPackage,
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/core/processor.rs b/src/core/processor.rs
@@ -58,8 +58,7 @@ mod tests {
         helpers::iter_into::IterInto,
         protocol::{data_package::DataPackage, payload::Payload},
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/core/validator.rs b/src/core/validator.rs
@@ -134,8 +134,7 @@ mod tests {
         protocol::constants::{MAX_TIMESTAMP_AHEAD_MS, MAX_TIMESTAMP_DELAY_MS},
     };
     use itertools::Itertools;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/crypto/keccak256.rs b/src/crypto/keccak256.rs
@@ -20,8 +20,7 @@ pub fn keccak256(data: &[u8]) -> Keccak256Hash {
 #[cfg(test)]
 mod tests {
     use crate::{crypto::keccak256::keccak256, helpers::hex::hex_to_bytes};
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/crypto/recover.rs b/src/crypto/recover.rs
@@ -124,8 +124,7 @@ mod tests {
         crypto::recover::{crypto256::recover_public_key, recover_address},
         helpers::hex::hex_to_bytes,
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/helpers/iter_into.rs b/src/helpers/iter_into.rs
@@ -34,8 +34,7 @@ mod iter_into_tests {
         helpers::iter_into::{IterInto, IterIntoOpt, OptIterIntoOpt},
         network::specific::U256,
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/network/as_str.rs b/src/network/as_str.rs
@@ -96,8 +96,7 @@ mod tests {
         as_str::{AsAsciiStr, AsHexStr},
         specific::U256,
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/network/assert.rs b/src/network/assert.rs
@@ -80,8 +80,7 @@ mod assert_or_revert_tests {
         assert::{assert_or_revert_bool_with, Assert},
         error::Error,
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 
@@ -111,8 +110,7 @@ mod assert_or_revert_tests {
 #[cfg(test)]
 mod unwrap_or_revert_tests {
     use crate::network::{assert::Unwrap, error::Error};
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/network/flattened.rs b/src/network/flattened.rs
@@ -14,8 +14,7 @@ impl Flattened<Bytes> for Vec<Bytes> {
 #[cfg(test)]
 mod tests {
     use crate::network::{flattened::Flattened, specific::Bytes};
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/network/from_bytes_repr.rs b/src/network/from_bytes_repr.rs
@@ -31,8 +31,7 @@ mod tests {
         from_bytes_repr::FromBytesRepr,
         specific::{U256, VALUE_SIZE},
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/protocol/data_package.rs b/src/protocol/data_package.rs
@@ -81,8 +81,7 @@ mod tests {
             data_point::DataPoint,
         },
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/protocol/data_point.rs b/src/protocol/data_point.rs
@@ -71,8 +71,7 @@ mod tests {
         },
     };
     use std::ops::Shr;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/protocol/marker.rs b/src/protocol/marker.rs
@@ -20,8 +20,7 @@ mod tests {
         helpers::hex::hex_to_bytes,
         protocol::{constants::REDSTONE_MARKER_BS, marker::trim_redstone_marker},
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/protocol/payload.rs b/src/protocol/payload.rs
@@ -51,8 +51,7 @@ mod tests {
             payload::{trim_metadata, trim_payload, Payload},
         },
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/utils/filter.rs b/src/utils/filter.rs
@@ -11,8 +11,7 @@ impl<T: Copy> FilterSome<Vec<T>> for [Option<T>] {
 #[cfg(test)]
 mod filter_some_tests {
     use crate::utils::filter::FilterSome;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/utils/median.rs b/src/utils/median.rs
@@ -93,8 +93,7 @@ mod tests {
     use crate::network::specific::U256;
     use itertools::Itertools;
     use std::fmt::Debug;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/utils/trim.rs b/src/utils/trim.rs
@@ -46,8 +46,7 @@ mod tests {
         protocol::constants::{REDSTONE_MARKER, REDSTONE_MARKER_BS},
         utils::trim::Trim,
     };
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
 

diff --git a/src/utils/trim_zeros.rs b/src/utils/trim_zeros.rs
@@ -23,8 +23,7 @@ impl TrimZeros for Vec<u8> {
 #[cfg(test)]
 mod tests {
     use crate::{protocol::constants::REDSTONE_MARKER, utils::trim_zeros::TrimZeros};
-    #[cfg(not(target_arch = "wasm32"))]
-    use test;
+
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::wasm_bindgen_test as test;