fix: builds

0xPolygonMiden · Aug 30, 2024 · 278317c · 278317c
1 parent 915ca47
commit 278317c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/crates/rust-client/build.rs b/crates/rust-client/build.rs
@@ -71,7 +71,9 @@ fn compile_tonic_client_proto(proto_dir: &Path) -> miette::Result<()> {
 fn replace_no_std_types() {
     let path = WEB_TONIC_CLIENT_PROTO_OUT_DIR.to_string() + "/rpc.rs";
     let file_str = fs::read_to_string(&path).unwrap();
-    let new_file_str = file_str.replace("std::result", "core::result");
+    let new_file_str = file_str
+        .replace("std::result", "core::result")
+        .replace("std::marker", "core::marker");
 
     let mut f = std::fs::OpenOptions::new().write(true).open(path).unwrap();
     f.write_all(new_file_str.as_bytes()).unwrap();

diff --git a/crates/rust-client/src/rpc/domain/blocks.rs b/crates/rust-client/src/rpc/domain/blocks.rs
@@ -37,7 +37,7 @@ impl TryFrom<&block::BlockHeader> for BlockHeader {
     type Error = RpcConversionError;
 
     fn try_from(value: &block::BlockHeader) -> Result<Self, Self::Error> {
-        value.clone().try_into()
+        (*value).try_into()
     }
 }
 

diff --git a/crates/rust-client/src/rpc/domain/digest.rs b/crates/rust-client/src/rpc/domain/digest.rs
@@ -127,14 +127,14 @@ impl TryFrom<&digest::Digest> for [Felt; 4] {
     type Error = RpcConversionError;
 
     fn try_from(value: &digest::Digest) -> Result<Self, Self::Error> {
-        value.clone().try_into()
+        (*value).try_into()
     }
 }
 
 impl TryFrom<&digest::Digest> for Digest {
     type Error = RpcConversionError;
 
     fn try_from(value: &digest::Digest) -> Result<Self, Self::Error> {
-        value.clone().try_into()
+        (*value).try_into()
     }
 }
diff --git a/crates/rust-client/src/rpc/tonic_client/mod.rs b/crates/rust-client/src/rpc/tonic_client/mod.rs
@@ -311,10 +311,8 @@ impl NodeRpcClient for TonicRpcClient {
             .nullifiers
             .iter()
             .map(|nul| {
-                let nullifier = nul
-                    .nullifier
-                    .clone()
-                    .ok_or(RpcError::ExpectedFieldMissing("Nullifier".to_string()))?;
+                let nullifier =
+                    nul.nullifier.ok_or(RpcError::ExpectedFieldMissing("Nullifier".to_string()))?;
                 let nullifier = nullifier.try_into()?;
                 Ok((nullifier, nul.block_num))
             })
@@ -440,7 +438,6 @@ impl TryFrom<SyncStateResponse> for StateSyncInfo {
             .map(|nul_update| {
                 let nullifier_digest = nul_update
                     .nullifier
-                    .clone()
                     .ok_or(RpcError::ExpectedFieldMissing("Nullifier".into()))?;
 
                 let nullifier_digest = Digest::try_from(nullifier_digest)
@@ -459,15 +456,15 @@ impl TryFrom<SyncStateResponse> for StateSyncInfo {
             .transactions
             .iter()
             .map(|transaction_summary| {
-                let transaction_id = transaction_summary.transaction_id.clone().ok_or(
+                let transaction_id = transaction_summary.transaction_id.ok_or(
                     RpcError::ExpectedFieldMissing("TransactionSummary.TransactionId".into()),
                 )?;
                 let transaction_id = TransactionId::try_from(transaction_id)
                     .map_err(|err| RpcError::DeserializationError(err.to_string()))?;
 
                 let transaction_block_num = transaction_summary.block_num;
 
-                let transaction_account_id = transaction_summary.account_id.clone().ok_or(
+                let transaction_account_id = transaction_summary.account_id.ok_or(
                     RpcError::ExpectedFieldMissing("TransactionSummary.TransactionId".into()),
                 )?;
                 let transaction_account_id = AccountId::try_from(transaction_account_id)

diff --git a/crates/rust-client/src/rpc/web_tonic_client/mod.rs b/crates/rust-client/src/rpc/web_tonic_client/mod.rs
@@ -294,7 +294,7 @@ impl NodeRpcClient for WebTonicRpcClient {
             .nullifiers
             .iter()
             .map(|nul| {
-                let nullifier = nul.nullifier.clone().ok_or(RpcError::ExpectedFieldMissing(
+                let nullifier = nul.nullifier.ok_or(RpcError::ExpectedFieldMissing(
                     "CheckNullifiersByPrefix response should have a `nullifier`".to_string(),
                 ))?;
                 let nullifier = nullifier.try_into()?;
@@ -423,7 +423,6 @@ impl TryFrom<SyncStateResponse> for StateSyncInfo {
             .map(|nul_update| {
                 let nullifier_digest = nul_update
                     .nullifier
-                    .clone()
                     .ok_or(RpcError::ExpectedFieldMissing("Nullifier".into()))?;
 
                 let nullifier_digest = Digest::try_from(nullifier_digest)?;
@@ -441,14 +440,14 @@ impl TryFrom<SyncStateResponse> for StateSyncInfo {
             .transactions
             .iter()
             .map(|transaction_summary| {
-                let transaction_id = transaction_summary.transaction_id.clone().ok_or(
+                let transaction_id = transaction_summary.transaction_id.ok_or(
                     RpcError::ExpectedFieldMissing("TransactionSummary.TransactionId".into()),
                 )?;
                 let transaction_id = TransactionId::try_from(transaction_id)?;
 
                 let transaction_block_num = transaction_summary.block_num;
 
-                let transaction_account_id = transaction_summary.account_id.clone().ok_or(
+                let transaction_account_id = transaction_summary.account_id.ok_or(
                     RpcError::ExpectedFieldMissing("TransactionSummary.TransactionId".into()),
                 )?;
                 let transaction_account_id = AccountId::try_from(transaction_account_id)?;