Skip to content

Commit fa5aa4d

Browse files
FrancoGiachettaFrancoGiachetta
committed
clippy
1 parent 09b3b62 commit fa5aa4d

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

‎crates/blockifier/src/blockifier/transaction_executor_test.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use starknet_api::test_utils::deploy_account::executable_deploy_account_tx;
66
use starknet_api::test_utils::invoke::executable_invoke_tx;
77
use starknet_api::test_utils::{NonceManager, DEFAULT_STRK_L1_GAS_PRICE};
88
use starknet_api::transaction::fields::Fee;
9-
use starknet_api::transaction::TransactionVersion;
9+
use starknet_api::transaction::{TransactionHash, TransactionVersion};
1010
use starknet_api::{declare_tx_args, deploy_account_tx_args, felt, invoke_tx_args, nonce};
1111
use starknet_types_core::felt::Felt;
1212

@@ -59,7 +59,7 @@ fn tx_executor_test_body<S: StateReader>(
5959
// TODO(Arni, 30/03/2024): Consider adding a test for the transaction execution info. If A test
6060
// should not be added, rename the test to `test_bouncer_info`.
6161
// TODO(Arni, 30/03/2024): Test all bouncer weights.
62-
let _tx_execution_output = tx_executor.execute(&tx).unwrap();
62+
let _tx_execution_output = tx_executor.execute(&(TransactionHash::default(), tx)).unwrap();
6363
let bouncer_weights = tx_executor.bouncer.get_accumulated_weights();
6464
assert_eq!(bouncer_weights.state_diff_size, expected_bouncer_weights.state_diff_size);
6565
assert_eq!(
@@ -279,14 +279,15 @@ fn test_bouncing(#[case] initial_bouncer_weights: BouncerWeights, #[case] n_even
279279
tx_executor.bouncer.set_accumulated_weights(initial_bouncer_weights);
280280

281281
tx_executor
282-
.execute(
283-
&emit_n_events_tx(
282+
.execute(&(
283+
TransactionHash::default(),
284+
emit_n_events_tx(
284285
n_events,
285286
account_address,
286287
contract_address,
287288
nonce_manager.next(account_address),
288289
)
289-
.into(),
290+
.into()),
290291
)
291292
.map_err(|error| panic!("{error:?}: {error}"))
292293
.unwrap();
@@ -305,7 +306,7 @@ fn test_execute_txs_bouncing(#[values(true, false)] concurrency_enabled: bool) {
305306

306307
let mut tx_executor = TransactionExecutor::new(state, block_context, config);
307308

308-
let txs: Vec<Transaction> = [
309+
let txs: Vec<(TransactionHash, Transaction)> = [
309310
emit_n_events_tx(1, account_address, contract_address, nonce!(0_u32)),
310311
// Transaction too big.
311312
emit_n_events_tx(
@@ -322,6 +323,7 @@ fn test_execute_txs_bouncing(#[values(true, false)] concurrency_enabled: bool) {
322323
]
323324
.into_iter()
324325
.map(Transaction::Account)
326+
.map(|tx| (TransactionHash::default(), tx))
325327
.collect();
326328

327329
// Run.
@@ -406,9 +408,9 @@ fn test_stack_overflow(#[values(true, false)] concurrency_enabled: bool) {
406408
// Run.
407409
let config = TransactionExecutorConfig::create_for_testing(concurrency_enabled);
408410
let mut executor = TransactionExecutor::new(state, block_context, config);
409-
let results = executor.execute_txs(&vec![account_tx.into()]);
411+
let results = executor.execute_txs(&vec![(TransactionHash::default(), account_tx.into())]);
410412

411-
let (tx_execution_info, _state_diff) = results[0].as_ref().unwrap();
413+
let (_, tx_execution_info, _state_diff) = results[0].as_ref().unwrap();
412414
assert!(tx_execution_info.is_reverted());
413415
let err = tx_execution_info.revert_error.clone().unwrap().to_string();
414416

‎crates/blockifier/src/concurrency/worker_logic_test.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use starknet_api::test_utils::declare::executable_declare_tx;
88
use starknet_api::test_utils::{NonceManager, TEST_ERC20_CONTRACT_ADDRESS2};
99
use starknet_api::transaction::constants::DEPLOY_CONTRACT_FUNCTION_ENTRY_POINT_NAME;
1010
use starknet_api::transaction::fields::{ContractAddressSalt, Fee, ValidResourceBounds};
11-
use starknet_api::transaction::TransactionVersion;
11+
use starknet_api::transaction::{TransactionHash, TransactionVersion};
1212
use starknet_api::{contract_address, declare_tx_args, felt, invoke_tx_args, nonce, storage_key};
1313
use starknet_types_core::felt::Felt;
1414

@@ -100,7 +100,8 @@ pub fn test_commit_tx() {
100100
]
101101
.into_iter()
102102
.map(Transaction::Account)
103-
.collect::<Vec<Transaction>>();
103+
.map(|tx| (TransactionHash::default(), tx))
104+
.collect::<Vec<(TransactionHash, Transaction)>>();
104105
let mut bouncer = Bouncer::new(block_context.bouncer_config.clone());
105106
let cached_state =
106107
test_state(&block_context.chain_info, BALANCE, &[(account, 1), (test_contract, 1)]);
@@ -169,7 +170,7 @@ pub fn test_commit_tx() {
169170
assert_eq!(felt!(expected_sequencer_storage_read), actual_sequencer_storage_read,);
170171
}
171172
}
172-
let tx_context = executor.block_context.to_tx_context(&txs[commit_idx]);
173+
let tx_context = executor.block_context.to_tx_context(&txs[commit_idx].1);
173174
expected_sequencer_balance_low += actual_fee;
174175
// Check that the sequencer balance was updated correctly in the state.
175176
verify_sequencer_balance_update(
@@ -196,11 +197,11 @@ fn test_commit_tx_when_sender_is_sequencer() {
196197
let (sequencer_balance_key_low, sequencer_balance_key_high) =
197198
get_sequencer_balance_keys(&block_context);
198199

199-
let sequencer_tx = [Transaction::Account(trivial_calldata_invoke_tx(
200+
let sequencer_tx = [(TransactionHash::default(), Transaction::Account(trivial_calldata_invoke_tx(
200201
account_address,
201202
test_contract_address,
202203
nonce!(0_u8),
203-
))];
204+
)))];
204205

205206
let mut bouncer = Bouncer::new(block_context.bouncer_config.clone());
206207

@@ -224,7 +225,7 @@ fn test_commit_tx_when_sender_is_sequencer() {
224225
let read_values_before_commit = fee_transfer_call_info.storage_read_values.clone();
225226
drop(execution_task_outputs);
226227

227-
let tx_context = &executor.block_context.to_tx_context(&sequencer_tx[0]);
228+
let tx_context = &executor.block_context.to_tx_context(&sequencer_tx[0].1);
228229
let fee_token_address =
229230
executor.block_context.chain_info.fee_token_address(&tx_context.tx_info.fee_type());
230231
let sequencer_balance_high_before =
@@ -310,8 +311,8 @@ fn test_worker_execute(default_all_resource_bounds: ValidResourceBounds) {
310311

311312
let txs = [tx_success, tx_failure, tx_revert]
312313
.into_iter()
313-
.map(Transaction::Account)
314-
.collect::<Vec<Transaction>>();
314+
.map(|tx| (TransactionHash::default(), tx.into()))
315+
.collect::<Vec<(TransactionHash, Transaction)>>();
315316

316317
let mut bouncer = Bouncer::new(block_context.bouncer_config.clone());
317318
let worker_executor = WorkerExecutor::new(
@@ -470,9 +471,8 @@ fn test_worker_validate(default_all_resource_bounds: ValidResourceBounds) {
470471

471472
let txs = [account_tx0, account_tx1]
472473
.into_iter()
473-
.map(Transaction::Account)
474-
.collect::<Vec<Transaction>>();
475-
474+
.map(|tx| (TransactionHash::default(), tx.into()))
475+
.collect::<Vec<(TransactionHash, Transaction)>>();
476476
let mut bouncer = Bouncer::new(block_context.bouncer_config.clone());
477477
let worker_executor = WorkerExecutor::new(
478478
safe_versioned_state.clone(),
@@ -583,7 +583,7 @@ fn test_deploy_before_declare(
583583
});
584584

585585
let txs =
586-
[declare_tx, invoke_tx].into_iter().map(Transaction::Account).collect::<Vec<Transaction>>();
586+
[declare_tx, invoke_tx].into_iter().map(Transaction::Account).map(|tx| (TransactionHash::default(), tx)).collect::<Vec<(TransactionHash, Transaction)>>();
587587

588588
let mut bouncer = Bouncer::new(block_context.bouncer_config.clone());
589589
let worker_executor =
@@ -656,7 +656,8 @@ fn test_worker_commit_phase(default_all_resource_bounds: ValidResourceBounds) {
656656
nonce: nonce_manager.next(sender_address)
657657
}))
658658
})
659-
.collect::<Vec<Transaction>>();
659+
.map(|tx| (TransactionHash::default(), tx))
660+
.collect::<Vec<(TransactionHash, Transaction)>>();
660661

661662
let mut bouncer = Bouncer::new(block_context.bouncer_config.clone());
662663
let worker_executor =
@@ -747,7 +748,8 @@ fn test_worker_commit_phase_with_halt() {
747748
nonce_manager.next(sender_address),
748749
))
749750
})
750-
.collect::<Vec<Transaction>>();
751+
.map(|tx| (TransactionHash::default(), tx))
752+
.collect::<Vec<(TransactionHash, Transaction)>>();
751753

752754
let mut bouncer = Bouncer::new(block_context.bouncer_config.clone());
753755
let worker_executor =

‎crates/blockifier/src/test_utils/transfers_generator.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use starknet_api::test_utils::invoke::executable_invoke_tx;
77
use starknet_api::test_utils::NonceManager;
88
use starknet_api::transaction::constants::TRANSFER_ENTRY_POINT_NAME;
99
use starknet_api::transaction::fields::Fee;
10-
use starknet_api::transaction::TransactionVersion;
10+
use starknet_api::transaction::{TransactionHash, TransactionVersion};
1111
use starknet_api::{calldata, felt, invoke_tx_args};
1212
use starknet_types_core::felt::Felt;
1313

@@ -141,20 +141,20 @@ impl TransfersGenerator {
141141
}
142142

143143
pub fn execute_transfers(&mut self) {
144-
let mut txs: Vec<Transaction> = Vec::with_capacity(self.config.n_txs);
144+
let mut txs: Vec<(TransactionHash, Transaction)> = Vec::with_capacity(self.config.n_txs);
145145
for _ in 0..self.config.n_txs {
146146
let sender_address = self.account_addresses[self.sender_index];
147147
let recipient_address = self.get_next_recipient();
148148
self.sender_index = (self.sender_index + 1) % self.account_addresses.len();
149149

150150
let tx = self.generate_transfer(sender_address, recipient_address);
151151
let account_tx = AccountTransaction::new_for_sequencing(tx);
152-
txs.push(Transaction::Account(account_tx));
152+
txs.push((TransactionHash::default(), Transaction::Account(account_tx)));
153153
}
154154
let results = self.executor.execute_txs(&txs);
155155
assert_eq!(results.len(), self.config.n_txs);
156156
for result in results {
157-
assert!(!result.unwrap().0.is_reverted());
157+
assert!(!result.unwrap().1.is_reverted());
158158
}
159159
// TODO(Avi, 01/06/2024): Run the same transactions concurrently on a new state and compare
160160
// the state diffs.

0 commit comments

Comments
 (0)