cleanup

Author: sergeytimoshin

prover/client/src/proof_client.rs

@@ -75,7 +75,7 @@ impl ProofClient {
             max_wait_time: Duration::from_secs(DEFAULT_MAX_WAIT_TIME_SECS),
             api_key: None,
             initial_poll_delay: Duration::from_millis(INITIAL_POLL_DELAY_SMALL_CIRCUIT_MS),
-        })
+        }
     }
 
     #[allow(unused)]
@@ -91,7 +91,7 @@ impl ProofClient {
             Duration::from_millis(INITIAL_POLL_DELAY_SMALL_CIRCUIT_MS)
         };
 
-        Self {
+        Ok(Self {
             client: build_http_client(),
             server_address,
             polling_interval,
@@ -116,7 +116,7 @@ impl ProofClient {
             max_wait_time,
             api_key,
             initial_poll_delay,
-        })
+        }
     }
 
     pub async fn submit_proof_async(

prover/client/src/prover.rs

@@ -6,7 +6,6 @@ use std::{
 
 use tokio::time::sleep;
 use tracing::info;
-use tokio::time::sleep;
 
 use crate::{
     constants::{HEALTH_CHECK, SERVER_ADDRESS},

sdk-libs/sdk-types/src/interface/program/decompression/pda.rs

@@ -151,7 +151,7 @@ where
         lamports: 0,
         merkle_context: PackedMerkleContext {
             merkle_tree_pubkey_index: tree_info.merkle_tree_pubkey_index,
-            queue_pubkey_index: input_queue_index,
+            queue_pubkey_index: tree_info.queue_pubkey_index,
             leaf_index: tree_info.leaf_index,
             prove_by_index: tree_info.prove_by_index,
         },

sdk-tests/sdk-token-test/tests/test_4_invocations.rs

@@ -47,9 +47,11 @@ fn pack_selected_output_tree_index(
         .next_tree_info
         .map(|next| next.pack_output_tree_index(remaining_accounts))
         .unwrap_or_else(|| tree_info.pack_output_tree_index(remaining_accounts))
-        .map_err(|error| Box::new(
-            RpcError::CustomError(format!("Failed to pack output tree index: {error}"))
-        ))
+        .map_err(|error| {
+            Box::new(RpcError::CustomError(format!(
+                "Failed to pack output tree index: {error}"
+            )))
+        })
 }
 
 #[ignore = "fix cpi context usage"]