apollo_consensus_orchestrator: rename standalone adjective variables

Author: dan-starkware

crates/apollo_consensus_orchestrator/src/build_proposal.rs

@@ -269,11 +269,16 @@ async fn get_proposal_content(
                 // If the blob writing operation to Aerospike doesn't return a success status, we
                 // can't finish the proposal. Must wait for it at least until batcher_timeout is
                 // reached.
-                let remaining = (args.batcher_deadline - args.deps.clock.now())
+                let remaining_duration = (args.batcher_deadline - args.deps.clock.now())
                     .to_std()
                     .unwrap_or_default()
-                    .max(MIN_WAIT_DURATION); // Ensure we wait at least 1 ms to avoid immediate timeout. 
-                match tokio::time::timeout(remaining, args.cende_write_success.borrow_mut()).await {
+                    .max(MIN_WAIT_DURATION); // Ensure we wait at least 1 ms to avoid immediate timeout.
+                match tokio::time::timeout(
+                    remaining_duration,
+                    args.cende_write_success.borrow_mut(),
+                )
+                .await
+                {
                     Err(_) => {
                         return Err(BuildProposalError::CendeWriteError(
                             "Writing blob to Aerospike didn't return in time.".to_string(),

crates/apollo_consensus_orchestrator/src/utils.rs

@@ -447,14 +447,14 @@ pub(crate) fn truncate_to_executed_txs(
     // Truncate `content` to keep only the first `final_n_executed_txs`, preserving batch
     // structure.
     let mut executed_content: Vec<Vec<InternalConsensusTransaction>> = Vec::new();
-    let mut remaining = final_n_executed_txs;
+    let mut remaining_tx_count = final_n_executed_txs;
 
     for batch in content {
-        if remaining < batch.len() {
-            executed_content.push(batch.into_iter().take(remaining).collect());
+        if remaining_tx_count < batch.len() {
+            executed_content.push(batch.into_iter().take(remaining_tx_count).collect());
             break;
         } else {
-            remaining -= batch.len();
+            remaining_tx_count -= batch.len();
             executed_content.push(batch);
         }
     }