simpler

Author: esemeniuc

core/src/banking_stage/consumer.rs

@@ -676,22 +676,21 @@ impl Consumer {
             for (key, writable) in
                 TransactionAccountLocksIterator::new(transaction_info).accounts_with_is_writable()
             {
-                if !has_contention {
-                    let conflicts = if writable {
-                        aggregate_write_locks.contains(key) || aggregate_read_locks.contains(key)
-                    } else {
-                        aggregate_write_locks.contains(key)
-                    };
-                    if conflicts {
-                        has_contention = true;
-                    }
-                }
                 if writable {
                     transaction_write_locks.push(*key);
                 } else {
                     transaction_read_locks.push(*key);
                 }
+
+                if !has_contention {
+                    if aggregate_write_locks.contains(key)
+                        || (writable && aggregate_read_locks.contains(key))
+                    {
+                        has_contention = true;
+                    }
+                }
             }
+
             if has_contention {
                 result.push(std::mem::take(&mut current_batch));
                 aggregate_write_locks.clear();