fix: minor issues in tests

dashpay · Jul 5, 2024 · 6aefd00 · 6aefd00
1 parent bedcde3
commit 6aefd00
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/dapi-grpc/src/mock/serde_mockable.rs b/packages/dapi-grpc/src/mock/serde_mockable.rs
@@ -5,11 +5,30 @@
 //! /// ## Example
 ///
 /// ```rust
+/// struct SomeObject {
+///    field: u32,
+/// }
+///
+/// impl dapi_grpc::mock::Mockable for SomeObject {
+///   fn mock_serialize(&self) -> Option<Vec<u8>> {
+///       Some(self.field.to_be_bytes().to_vec())
+///   }
+///
+///   fn mock_deserialize(bytes: &[u8]) -> Option<Self> {
+///      if bytes.len() != 4 {
+///         return None;
+///      }
+///
+///      Some(SomeObject {   
+///         field: u32::from_be_bytes(bytes.try_into().expect("4 bytes")),
+///      })
+///   }
+/// }
 ///
 /// #[derive(serde::Serialize,serde::Deserialize)]
 /// struct TestStruct {
 ///     #[serde(with="dapi_grpc::mock::serde_mockable")]
-///     field: u32,
+///     field: SomeObject,
 /// }
 /// ```
 use super::Mockable;

diff --git a/packages/rs-dapi-client/src/dapi_client.rs b/packages/rs-dapi-client/src/dapi_client.rs
@@ -22,7 +22,7 @@ pub enum DapiClientError<TE: Mockable> {
     /// The error happened on transport layer
     #[error("transport error with {1}: {0}")]
     Transport(
-        #[serde(with = "dapi_grpc::mock::serde_mockable")] TE,
+        #[cfg_attr(feature = "mocks", serde(with = "dapi_grpc::mock::serde_mockable"))] TE,
         Address,
     ),
     /// There are no valid DAPI addresses to use.
@@ -50,6 +50,8 @@ impl<TE: CanRetry + Mockable> CanRetry for DapiClientError<TE> {
         }
     }
 }
+
+#[cfg(feature = "mocks")]
 #[derive(serde::Serialize, serde::Deserialize)]
 struct TransportErrorData {
     transport_error: Vec<u8>,
@@ -60,10 +62,12 @@ struct TransportErrorData {
 ///
 /// We need to do manual serialization because of the generic type parameter which doesn't support serde derive.
 impl<TE: Mockable> Mockable for DapiClientError<TE> {
+    #[cfg(feature = "mocks")]
     fn mock_serialize(&self) -> Option<Vec<u8>> {
         Some(serde_json::to_vec(self).expect("serialize DAPI client error"))
     }
 
+    #[cfg(feature = "mocks")]
     fn mock_deserialize(data: &[u8]) -> Option<Self> {
         Some(serde_json::from_slice(data).expect("deserialize DAPI client error"))
     }

diff --git a/packages/rs-dapi-client/tests/local_platform_connectivity.rs b/packages/rs-dapi-client/tests/local_platform_connectivity.rs
@@ -1,7 +1,10 @@
 #[cfg(not(feature = "offline-testing"))]
 mod tests {
-    use dapi_grpc::platform::v0::{
-        self as platform_proto, get_identity_response, GetIdentityResponse, ResponseMetadata,
+    use dapi_grpc::{
+        platform::v0::{
+            self as platform_proto, get_identity_response, GetIdentityResponse, ResponseMetadata,
+        },
+        tonic::transport::Uri,
     };
     use rs_dapi_client::{AddressList, DapiClient, DapiRequest, RequestSettings};
 
@@ -13,7 +16,7 @@ mod tests {
     #[tokio::test]
     async fn get_identity() {
         let mut address_list = AddressList::new();
-        address_list.add_uri(rs_dapi_client::Uri::from_static("http://127.0.0.1:2443"));
+        address_list.add_uri(Uri::from_static("http://127.0.0.1:2443"));
 
         let mut client = DapiClient::new(address_list, RequestSettings::default());
         let request = platform_proto::GetIdentityRequest {

diff --git a/packages/rs-dapi-client/tests/mock_dapi_client.rs b/packages/rs-dapi-client/tests/mock_dapi_client.rs
@@ -1,8 +1,11 @@
-use dapi_grpc::platform::v0::{GetIdentityRequest, GetIdentityResponse, Proof};
-
-use rs_dapi_client::{mock::MockDapiClient, DapiRequest, DapiRequestExecutor, RequestSettings};
+#[cfg(feature = "mocks")]
+use {
+    dapi_grpc::platform::v0::{GetIdentityRequest, GetIdentityResponse, Proof},
+    rs_dapi_client::{mock::MockDapiClient, DapiRequest, DapiRequestExecutor, RequestSettings},
+};
 
 #[tokio::test]
+#[cfg(feature = "mocks")]
 async fn test_mock_get_identity_dapi_client() {
     let mut dapi = MockDapiClient::new();
 

diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml
@@ -32,7 +32,6 @@ rand = "0.8.5"
 tempfile = "3.3.0"
 hex = "0.4.3"
 indexmap = { version = "2.2.6", features = ["serde"] }
-sha2 = "0.10.6"
 dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.2" }
 dpp = { path = "../rs-dpp", features = ["abci"] }
 simple-signer = { path = "../simple-signer" }

diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml
@@ -36,7 +36,6 @@ dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0
 lru = { version = "0.12.3", optional = true }
 bip37-bloom-filter = { git = "https://github.com/dashpay/rs-bip37-bloom-filter", branch = "develop" }
 pollster = { version = "0.3.0" }
-sha2 = "0.10.8"
 
 [dev-dependencies]
 tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }