[rust-toolchain] Update to rust 1.61

Closes: aptos-labs#1104

crates/aptos-faucet/src/lib.rs

@@ -26,12 +26,9 @@ use aptos_sdk::{
     transaction_builder::{aptos_stdlib, TransactionFactory},
     types::{chain_id::ChainId, LocalAccount},
 };
+use futures::lock::Mutex;
 use reqwest::StatusCode;
-use std::{
-    convert::Infallible,
-    fmt,
-    sync::{Arc, Mutex},
-};
+use std::{convert::Infallible, fmt, sync::Arc};
 use url::Url;
 use warp::{http, Filter, Rejection, Reply};
 
@@ -108,7 +105,7 @@ fn health_route(
 }
 
 async fn handle_health(service: Arc<Service>) -> Result<Box<dyn warp::Reply>, Infallible> {
-    let faucet_address = service.faucet_account.lock().unwrap().address();
+    let faucet_address = service.faucet_account.lock().await.address();
     let faucet_account = service.client.get_account(faucet_address).await;
 
     match faucet_account {
@@ -183,7 +180,7 @@ pub async fn delegate_mint_account(
 
     // Delegate minting to the account
     {
-        let mut faucet_account = service.faucet_account.lock().unwrap();
+        let mut faucet_account = service.faucet_account.lock().await;
         service
             .client
             .submit_and_wait(&faucet_account.sign_with_transaction_builder(

crates/aptos-faucet/src/main.rs

@@ -113,7 +113,7 @@ async fn main() {
     info!(
         "[faucet]: running on: {}. Minting from {}",
         address,
-        actual_service.faucet_account.lock().unwrap().address()
+        actual_service.faucet_account.lock().await.address()
     );
     warp::serve(aptos_faucet::routes(actual_service))
         .run(address)
@@ -493,7 +493,7 @@ mod tests {
     #[tokio::test]
     async fn test_mint_fullnode_error() {
         let (accounts, service) = setup(None);
-        let address = service.faucet_account.lock().unwrap().address();
+        let address = service.faucet_account.lock().await.address();
         accounts.write().remove(&address);
         let filter = routes(service);
 

crates/aptos-faucet/src/mint.rs

@@ -114,7 +114,7 @@ pub async fn process(service: &Service, params: MintParams) -> Result<Response>
 
     let (mut faucet_seq, mut receiver_seq) = sequences(service, receiver_address).await?;
     let our_faucet_seq = {
-        let mut faucet_account = service.faucet_account.lock().unwrap();
+        let mut faucet_account = service.faucet_account.lock().await;
 
         // If the onchain sequence_number is greater than what we have, update our
         // sequence_numbers
@@ -143,7 +143,7 @@ pub async fn process(service: &Service, params: MintParams) -> Result<Response>
     // After 30 seconds, we still have not caught up, we are likely unhealthy
     if our_faucet_seq >= faucet_seq + 50 {
         error!("We are unhealthy, transactions have likely expired.");
-        let mut faucet_account = service.faucet_account.lock().unwrap();
+        let mut faucet_account = service.faucet_account.lock().await;
         if faucet_account.sequence_number() >= faucet_seq + 50 {
             info!("Resetting the sequence number counter.");
             *faucet_account.sequence_number_mut() = faucet_seq;
@@ -155,7 +155,7 @@ pub async fn process(service: &Service, params: MintParams) -> Result<Response>
     let mut txns = vec![];
 
     {
-        let mut faucet_account = service.faucet_account.lock().unwrap();
+        let mut faucet_account = service.faucet_account.lock().await;
 
         if receiver_seq.is_none() {
             let builder =
@@ -184,7 +184,7 @@ pub async fn process(service: &Service, params: MintParams) -> Result<Response>
     // If there was an issue submitting a transaction we should just reset our sequence_numbers
     // to what was on chain
     if responses.iter().any(Result::is_err) {
-        *service.faucet_account.lock().unwrap().sequence_number_mut() = faucet_seq;
+        *service.faucet_account.lock().await.sequence_number_mut() = faucet_seq;
     }
 
     while !responses.is_empty() {
@@ -204,7 +204,7 @@ pub async fn process(service: &Service, params: MintParams) -> Result<Response>
 }
 
 async fn sequences(service: &Service, receiver: AccountAddress) -> Result<(u64, Option<u64>)> {
-    let faucet_address = service.faucet_account.lock().unwrap().address();
+    let faucet_address = service.faucet_account.lock().await.address();
     let f_request = service.client.get_account(faucet_address);
     let r_request = service.client.get_account(receiver);
     let mut responses = futures::future::join_all([f_request, r_request]).await;

rust-toolchain

@@ -1 +1 @@
-1.60.0
+1.61.0

state-sync/state-sync-v1/src/fuzzing.rs

@@ -10,13 +10,12 @@ use crate::{
     shared_components::test_utils,
 };
 use aptos_config::network_id::NetworkId;
-use aptos_infallible::Mutex;
 use aptos_types::{
     ledger_info::LedgerInfoWithSignatures, transaction::TransactionListWithProof, PeerId,
 };
 use aptos_vm::AptosVM;
 use executor::chunk_executor::ChunkExecutor;
-use futures::executor::block_on;
+use futures::{executor::block_on, lock::Mutex};
 use mempool_notifications::MempoolNotifier;
 use once_cell::sync::Lazy;
 use proptest::{
@@ -43,6 +42,7 @@ pub fn test_state_sync_msg_fuzzer_impl(message: StateSyncMessage) {
     block_on(async move {
         let _ = STATE_SYNC_COORDINATOR
             .lock()
+            .await
             .process_chunk_message(
                 NetworkId::Validator,
                 PeerId::new([0u8; PeerId::LENGTH]),