diff --git a/src/scheduler.rs b/src/scheduler.rs index 1092682..2b28008 100644 --- a/src/scheduler.rs +++ b/src/scheduler.rs @@ -634,7 +634,7 @@ where } // partition or repartition the txs self.partition_transactions(); - if self.num_partitions == 1 && force_sequential { + if self.num_partitions == 1 { break; } diff --git a/tests/erc20/main.rs b/tests/erc20/main.rs index 52de5ec..d3ba7fc 100644 --- a/tests/erc20/main.rs +++ b/tests/erc20/main.rs @@ -199,7 +199,7 @@ fn erc20_batch_transfer() { final_txs, true, [ - ("grevm.parallel_round_calls", DebugValue::Counter(1)), + ("grevm.parallel_round_calls", DebugValue::Counter(0)), ("grevm.conflict_tx_cnt", DebugValue::Counter(0)), ] .into_iter() diff --git a/tests/native_transfers.rs b/tests/native_transfers.rs index d2cc8af..0a90742 100644 --- a/tests/native_transfers.rs +++ b/tests/native_transfers.rs @@ -171,9 +171,9 @@ fn native_with_all_related() { txs, false, [ - ("grevm.parallel_round_calls", DebugValue::Counter(2)), - ("grevm.sequential_execute_calls", DebugValue::Counter(0)), - ("grevm.parallel_tx_cnt", DebugValue::Counter(block_size as u64)), + ("grevm.parallel_round_calls", DebugValue::Counter(1)), + ("grevm.sequential_execute_calls", DebugValue::Counter(1)), + ("grevm.parallel_tx_cnt", DebugValue::Counter(4)), ("grevm.conflict_tx_cnt", DebugValue::Counter(96)), ("grevm.unconfirmed_tx_cnt", DebugValue::Counter(0)), ("grevm.reusable_tx_cnt", DebugValue::Counter(0)), @@ -336,9 +336,9 @@ fn native_transfer_with_beneficiary() { txs, true, [ - ("grevm.parallel_round_calls", DebugValue::Counter(2)), - ("grevm.sequential_execute_calls", DebugValue::Counter(0)), - ("grevm.parallel_tx_cnt", DebugValue::Counter(24 as u64)), + ("grevm.parallel_round_calls", DebugValue::Counter(1)), + ("grevm.sequential_execute_calls", DebugValue::Counter(1)), + ("grevm.parallel_tx_cnt", DebugValue::Counter(20 as u64)), ("grevm.conflict_tx_cnt", DebugValue::Counter(4)), ("grevm.unconfirmed_tx_cnt", DebugValue::Counter(0)), ("grevm.reusable_tx_cnt", DebugValue::Counter(0)),