scrypto 1.3.0

redstone-finance · Nov 28, 2024 · 296ce7d · 296ce7d
1 parent 76c76b8
commit 296ce7d
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 76 deletions.
diff --git a/src/core/aggregator.rs b/src/core/aggregator.rs
@@ -72,14 +72,14 @@ fn make_value_signer_matrix(config: &Config, data_packages: Vec<DataPackage>) ->
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod aggregate_matrix_tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         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;
 
     #[test]
     fn test_aggregate_matrix() {
@@ -147,10 +147,6 @@ mod aggregate_matrix_tests {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod make_value_signer_matrix {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         core::{
             aggregator::{make_value_signer_matrix, Matrix},
@@ -161,6 +157,10 @@ 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;
 
     #[test]
     fn test_make_value_signer_matrix_empty() {

diff --git a/src/core/processor.rs b/src/core/processor.rs
@@ -46,10 +46,6 @@ fn make_processor_result(config: Config, payload: Payload) -> ProcessorResult {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         core::{
             config::Config,
@@ -62,6 +58,10 @@ 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;
 
     #[test]
     fn test_make_processor_result() {

diff --git a/src/core/validator.rs b/src/core/validator.rs
@@ -118,10 +118,6 @@ impl Validator for Config {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         core::{
             config::Config,
@@ -138,6 +134,10 @@ 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;
 
     #[test]
     fn test_feed_index() {

diff --git a/src/crypto/keccak256.rs b/src/crypto/keccak256.rs
@@ -19,11 +19,11 @@ pub fn keccak256(data: &[u8]) -> Keccak256Hash {
 #[cfg(feature = "helpers")]
 #[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;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
-    use crate::{crypto::keccak256::keccak256, helpers::hex::hex_to_bytes};
 
     const MESSAGE: &str = "415641580000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d394303d018d79bf0ba000000020000001";
     const MESSAGE_HASH: &str = "f0805644755393876d0e917e553f0c206f8bc68b7ebfe73a79d2a9e7f5a4cea6";

diff --git a/src/crypto/recover.rs b/src/crypto/recover.rs
@@ -120,14 +120,14 @@ pub(crate) mod crypto256 {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         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;
 
     const MESSAGE: &str = "415641580000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d394303d018d79bf0ba000000020000001";
     const MESSAGE_HASH: &str = "f0805644755393876d0e917e553f0c206f8bc68b7ebfe73a79d2a9e7f5a4cea6";

diff --git a/src/helpers/iter_into.rs b/src/helpers/iter_into.rs
@@ -30,14 +30,14 @@ impl<U: Copy, T: Copy + Into<U>> IterIntoOpt<Vec<Option<U>>> for Vec<T> {
 
 #[cfg(test)]
 mod iter_into_tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         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;
 
     #[test]
     fn test_iter_into() {

diff --git a/src/network/as_str.rs b/src/network/as_str.rs
@@ -92,14 +92,14 @@ impl AsAsciiStr for U256 {
 
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::network::{
         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;
 
     const ETH: u32 = 4543560u32;
 

diff --git a/src/network/assert.rs b/src/network/assert.rs
@@ -76,14 +76,14 @@ where
 
 #[cfg(test)]
 mod assert_or_revert_tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::network::{
         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;
 
     #[test]
     fn test_assert_or_revert_bool_with_true() {
@@ -110,11 +110,11 @@ 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;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
-    use crate::network::{assert::Unwrap, error::Error};
 
     #[test]
     fn test_unwrap_or_revert_some() {

diff --git a/src/network/flattened.rs b/src/network/flattened.rs
@@ -13,11 +13,11 @@ 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;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
-    use crate::network::{flattened::Flattened, specific::Bytes};
 
     #[test]
     fn test_bytes_flattened() {

diff --git a/src/network/from_bytes_repr.rs b/src/network/from_bytes_repr.rs
@@ -27,14 +27,14 @@ impl Sanitized for Vec<u8> {
 
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::network::{
         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;
 
     #[cfg(feature = "network_radix")]
     use crate::network::radix::u256_ext::U256Ext;

diff --git a/src/protocol/data_package.rs b/src/protocol/data_package.rs
@@ -69,10 +69,6 @@ impl Debug for DataPackage {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         helpers::hex::hex_to_bytes,
         network::{from_bytes_repr::FromBytesRepr, specific::U256},
@@ -85,6 +81,10 @@ 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;
 
     const DATA_PACKAGE_BYTES_1: &str = "4554480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000360cafc94e018d79bf0ba00000002000000151afa8c5c3caf6004b42c0fb17723e524f993b9ecbad3b9bce5ec74930fa436a3660e8edef10e96ee5f222de7ef5787c02ca467c0ec18daa2907b43ac20c63c11c";
     const DATA_PACKAGE_BYTES_2: &str = "4554480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000360cdd851e018d79bf0ba000000020000001473fd9dc72e6814a7de719b403cf4c9eba08934a643fd0666c433b806b31e69904f2226ffd3c8ef75861b11b5e32a1fda4b1458e0da4605a772dfba2a812f3ee1b";

diff --git a/src/protocol/data_point.rs b/src/protocol/data_point.rs
@@ -59,10 +59,6 @@ impl Debug for DataPoint {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         helpers::hex::hex_to_bytes,
         network::{
@@ -75,6 +71,10 @@ 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;
 
     const DATA_POINT_BYTES_TAIL: &str = "4554480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000360cafc94e";
     const VALUE: u128 = 232141080910;

diff --git a/src/protocol/marker.rs b/src/protocol/marker.rs
@@ -16,14 +16,14 @@ pub fn trim_redstone_marker(payload: &mut Vec<u8>) {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         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;
 
     const PAYLOAD_TAIL: &str = "1c000f000000000002ed57011e0000";
 

diff --git a/src/protocol/payload.rs b/src/protocol/payload.rs
@@ -44,17 +44,17 @@ fn trim_metadata(payload: &mut Vec<u8>) -> usize {
 #[cfg(feature = "helpers")]
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         helpers::hex::{hex_to_bytes, read_payload_bytes, read_payload_hex},
         protocol::{
             constants::REDSTONE_MARKER_BS,
             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;
 
     const PAYLOAD_METADATA_BYTES: &str = "000f000000";
     const PAYLOAD_METADATA_WITH_UNSIGNED_BYTE: &str = "000f55000001";

diff --git a/src/utils/filter.rs b/src/utils/filter.rs
@@ -10,11 +10,11 @@ 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;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
-    use crate::utils::filter::FilterSome;
 
     #[test]
     fn test_filter_some() {

diff --git a/src/utils/median.rs b/src/utils/median.rs
@@ -89,14 +89,14 @@ where
 
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use super::{Avg, Median};
     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;
 
     #[cfg(feature = "network_radix")]
     use crate::network::radix::u256_ext::U256Ext;

diff --git a/src/utils/trim.rs b/src/utils/trim.rs
@@ -41,15 +41,15 @@ impl Trim<u64> for Vec<u8> {
 
 #[cfg(test)]
 mod tests {
-    #[cfg(target_arch = "wasm32")]
-    use wasm_bindgen_test::wasm_bindgen_test as test;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
     use crate::{
         network::specific::U256,
         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;
 
     const MARKER_DECIMAL: u64 = 823907890102272;
 
@@ -108,7 +108,8 @@ mod tests {
         let (_, result): (_, u64) = test_trim_end(size);
         assert_eq!(result, MARKER_DECIMAL);
 
-        #[cfg(not(target_arch = "wasm32"))] {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
             let (_, result): (_, usize) = test_trim_end(size);
             assert_eq!(result, 823907890102272usize);
         }

diff --git a/src/utils/trim_zeros.rs b/src/utils/trim_zeros.rs
@@ -22,11 +22,11 @@ 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;
-    #[cfg(not(target_arch = "wasm32"))]
-    use test as test;
-    use crate::{protocol::constants::REDSTONE_MARKER, utils::trim_zeros::TrimZeros};
 
     fn redstone_marker_bytes() -> Vec<u8> {
         REDSTONE_MARKER.as_slice().into()