apollo_storage: rename standalone adjective variables

Author: dan-starkware

crates/apollo_storage/src/body/mod.rs

@@ -316,19 +316,19 @@ impl<'env, Mode: TransactionKind> StorageTxn<'env, Mode> {
             return Ok(None);
         }
         let mut cursor = transaction_metadata_table.cursor(&self.txn)?;
-        let mut current =
+        let mut current_entry =
             cursor.lower_bound(&TransactionIndex(block_number, TransactionOffsetInBlock(0)))?;
 
         // TODO(dvir): consider initializing with capacity based on the get_block_transactions_count
         // function.
         let mut res = Vec::new();
-        while let Some((TransactionIndex(current_block_number, _), tx_metadata)) = current {
+        while let Some((TransactionIndex(current_block_number, _), tx_metadata)) = current_entry {
             if current_block_number != block_number {
                 break;
             }
             let tx_output = tx_metadata_to_tx_object(tx_metadata, &self.file_handlers)?;
             res.push(tx_output);
-            current = cursor.next()?;
+            current_entry = cursor.next()?;
         }
         Ok(Some(res))
     }

crates/apollo_storage/src/db/table_types/test_utils.rs

@@ -234,41 +234,41 @@ fn table_cursor_test<T: TableType>(
 
     // Test lower_bound().
     let mut cursor = table.cursor(&txn).unwrap();
-    let current = cursor.lower_bound(&(0, 0)).unwrap();
-    assert_eq!(current, Some(((1, 1), 7)));
-    let current = cursor.lower_bound(&(2, 2)).unwrap();
-    assert_eq!(current, Some(((2, 2), 2)));
-    let current = cursor.lower_bound(&(2, 4)).unwrap();
-    assert_eq!(current, Some(((3, 1), 8)));
-    let current = cursor.lower_bound(&(4, 4)).unwrap();
-    assert_eq!(current, None);
+    let current_entry = cursor.lower_bound(&(0, 0)).unwrap();
+    assert_eq!(current_entry, Some(((1, 1), 7)));
+    let current_entry = cursor.lower_bound(&(2, 2)).unwrap();
+    assert_eq!(current_entry, Some(((2, 2), 2)));
+    let current_entry = cursor.lower_bound(&(2, 4)).unwrap();
+    assert_eq!(current_entry, Some(((3, 1), 8)));
+    let current_entry = cursor.lower_bound(&(4, 4)).unwrap();
+    assert_eq!(current_entry, None);
 
     // Iterate using next().
     let mut cursor = table.cursor(&txn).unwrap();
-    let mut current = cursor.lower_bound(&(0, 0)).unwrap();
+    let mut current_entry = cursor.lower_bound(&(0, 0)).unwrap();
     for kv_pair in SORTED_VALUES {
-        assert_eq!(current, Some(kv_pair));
-        current = cursor.next().unwrap();
+        assert_eq!(current_entry, Some(kv_pair));
+        current_entry = cursor.next().unwrap();
     }
-    current = cursor.next().unwrap();
-    assert_eq!(current, None);
+    current_entry = cursor.next().unwrap();
+    assert_eq!(current_entry, None);
     // In the end still return None.
-    current = cursor.next().unwrap();
-    assert_eq!(current, None);
+    current_entry = cursor.next().unwrap();
+    assert_eq!(current_entry, None);
 
     // Iterate using prev().
     let mut cursor = table.cursor(&txn).unwrap();
-    let mut current = cursor.lower_bound(&(4, 4)).unwrap();
-    assert_eq!(current, None);
+    let mut current_entry = cursor.lower_bound(&(4, 4)).unwrap();
+    assert_eq!(current_entry, None);
     for kv_pair in SORTED_VALUES.iter().rev().cloned() {
-        current = cursor.prev().unwrap();
-        assert_eq!(current, Some(kv_pair));
+        current_entry = cursor.prev().unwrap();
+        assert_eq!(current_entry, Some(kv_pair));
     }
-    current = cursor.prev().unwrap();
-    assert_eq!(current, None);
+    current_entry = cursor.prev().unwrap();
+    assert_eq!(current_entry, None);
     // In the end still return None.
-    current = cursor.prev().unwrap();
-    assert_eq!(current, None);
+    current_entry = cursor.prev().unwrap();
+    assert_eq!(current_entry, None);
 }
 
 // Constants for random_table_test.