Skip to content

Commit

Permalink
Merge pull request #2 from starkware-libs/alon.dotan/main/format
Browse files Browse the repository at this point in the history
fix(format): run format fix on all repo
  • Loading branch information
alon-dotan-starkware authored May 21, 2024
2 parents 93ca0d7 + 8229659 commit da50437
Show file tree
Hide file tree
Showing 75 changed files with 859 additions and 395 deletions.
5 changes: 4 additions & 1 deletion crates/blockifier/src/blockifier/stateful_validator_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ use crate::test_utils::initial_test_state::{fund_account, test_state};
use crate::test_utils::{CairoVersion, NonceManager, BALANCE};
use crate::transaction::account_transaction::AccountTransaction;
use crate::transaction::test_utils::{
block_context, create_account_tx_for_validate_test, FaultyAccountTxCreatorArgs, VALID,
block_context,
create_account_tx_for_validate_test,
FaultyAccountTxCreatorArgs,
VALID,
};
use crate::transaction::transaction_types::TransactionType;

Expand Down
15 changes: 12 additions & 3 deletions crates/blockifier/src/blockifier/transaction_executor_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,22 @@ use crate::test_utils::declare::declare_tx;
use crate::test_utils::deploy_account::deploy_account_tx;
use crate::test_utils::initial_test_state::test_state;
use crate::test_utils::{
create_calldata, CairoVersion, NonceManager, BALANCE, DEFAULT_STRK_L1_GAS_PRICE,
create_calldata,
CairoVersion,
NonceManager,
BALANCE,
DEFAULT_STRK_L1_GAS_PRICE,
};
use crate::transaction::account_transaction::AccountTransaction;
use crate::transaction::errors::TransactionExecutionError;
use crate::transaction::test_utils::{
account_invoke_tx, block_context, calculate_class_info_for_testing, create_test_init_data,
emit_n_events_tx, l1_resource_bounds, TestInitData,
account_invoke_tx,
block_context,
calculate_class_info_for_testing,
create_test_init_data,
emit_n_events_tx,
l1_resource_bounds,
TestInitData,
};
use crate::transaction::transaction_execution::Transaction;
use crate::transaction::transactions::L1HandlerTransaction;
Expand Down
3 changes: 2 additions & 1 deletion crates/blockifier/src/bouncer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ use serde::Deserialize;
use starknet_api::core::ClassHash;

use crate::blockifier::transaction_executor::{
TransactionExecutorError, TransactionExecutorResult,
TransactionExecutorError,
TransactionExecutorResult,
};
use crate::execution::call_info::ExecutionSummary;
use crate::fee::gas_usage::get_onchain_data_segment_length;
Expand Down
3 changes: 2 additions & 1 deletion crates/blockifier/src/bouncer_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ use starknet_api::{class_hash, contract_address, patricia_key};

use super::BouncerConfig;
use crate::blockifier::transaction_executor::{
TransactionExecutorError, TransactionExecutorResult,
TransactionExecutorError,
TransactionExecutorResult,
};
use crate::bouncer::{Bouncer, BouncerWeights, BuiltinCount};
use crate::context::BlockContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ use starknet_api::{calldata, class_hash, contract_address, patricia_key, stark_f

use crate::abi::abi_utils::{get_fee_token_var_address, get_storage_var_address};
use crate::concurrency::versioned_state_proxy::{
ThreadSafeVersionedState, VersionedState, VersionedStateProxy,
ThreadSafeVersionedState,
VersionedState,
VersionedStateProxy,
};
use crate::context::BlockContext;
use crate::state::cached_state::{CachedState, StateMaps};
Expand Down
5 changes: 4 additions & 1 deletion crates/blockifier/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ use starknet_api::core::{ChainId, ContractAddress};

use crate::blockifier::block::BlockInfo;
use crate::transaction::objects::{
FeeType, HasRelatedFeeType, TransactionInfo, TransactionInfoCreator,
FeeType,
HasRelatedFeeType,
TransactionInfo,
TransactionInfoCreator,
};
use crate::versioned_constants::VersionedConstants;

Expand Down
9 changes: 6 additions & 3 deletions crates/blockifier/src/execution/common_hints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ use std::rc::Rc;

use cairo_felt::{Felt252, PRIME_STR};
use cairo_vm::hint_processor::builtin_hint_processor::builtin_hint_processor_definition::{
BuiltinHintProcessor, HintFunc,
BuiltinHintProcessor,
HintFunc,
};
use cairo_vm::hint_processor::builtin_hint_processor::hint_utils::{
get_integer_from_var_name, insert_value_from_var_name,
get_integer_from_var_name,
insert_value_from_var_name,
};
use cairo_vm::hint_processor::hint_processor_definition::HintReference;
use cairo_vm::serde::deserialize_program::ApTracking;
Expand All @@ -20,7 +22,8 @@ use num_bigint::BigUint;
use num_traits::{Num, One, Zero};

use crate::execution::hint_code::{
NORMALIZE_ADDRESS_SET_IS_250_HINT, NORMALIZE_ADDRESS_SET_IS_SMALL_HINT,
NORMALIZE_ADDRESS_SET_IS_250_HINT,
NORMALIZE_ADDRESS_SET_IS_SMALL_HINT,
};

/// Transaction execution mode.
Expand Down
10 changes: 8 additions & 2 deletions crates/blockifier/src/execution/contract_class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ use cairo_lang_casm::hints::Hint;
use cairo_lang_starknet_classes::casm_contract_class::{CasmContractClass, CasmContractEntryPoint};
use cairo_lang_starknet_classes::NestedIntList;
use cairo_vm::serde::deserialize_program::{
ApTracking, FlowTrackingData, HintParams, ReferenceManager,
ApTracking,
FlowTrackingData,
HintParams,
ReferenceManager,
};
use cairo_vm::types::errors::program_errors::ProgramError;
use cairo_vm::types::program::Program;
Expand All @@ -20,7 +23,10 @@ use serde::de::Error as DeserializationError;
use serde::{Deserialize, Deserializer};
use starknet_api::core::EntryPointSelector;
use starknet_api::deprecated_contract_class::{
ContractClass as DeprecatedContractClass, EntryPoint, EntryPointOffset, EntryPointType,
ContractClass as DeprecatedContractClass,
EntryPoint,
EntryPointOffset,
EntryPointType,
Program as DeprecatedProgram,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ use crate::execution::call_info::{CallExecution, CallInfo};
use crate::execution::contract_class::ContractClassV0;
use crate::execution::deprecated_syscalls::hint_processor::DeprecatedSyscallHintProcessor;
use crate::execution::entry_point::{
CallEntryPoint, EntryPointExecutionContext, EntryPointExecutionResult,
CallEntryPoint,
EntryPointExecutionContext,
EntryPointExecutionResult,
};
use crate::execution::errors::{PostExecutionError, PreExecutionError};
use crate::execution::execution_utils::{
read_execution_retdata, stark_felt_to_felt, Args, ReadOnlySegments,
read_execution_retdata,
stark_felt_to_felt,
Args,
ReadOnlySegments,
};
use crate::state::state_api::State;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ use starknet_api::core::{calculate_contract_address, ChainId, PatriciaKey};
use starknet_api::hash::{StarkFelt, StarkHash};
use starknet_api::state::StorageKey;
use starknet_api::transaction::{
Calldata, ContractAddressSalt, EventContent, EventData, EventKey, Fee, TransactionHash,
Calldata,
ContractAddressSalt,
EventContent,
EventData,
EventKey,
Fee,
TransactionHash,
TransactionVersion,
};
use starknet_api::{calldata, stark_felt};
Expand All @@ -29,13 +35,22 @@ use crate::state::state_api::StateReader;
use crate::test_utils::contracts::FeatureContract;
use crate::test_utils::initial_test_state::test_state;
use crate::test_utils::{
calldata_for_deploy_test, get_syscall_resources, trivial_external_entry_point_new,
CairoVersion, CHAIN_ID_NAME, CURRENT_BLOCK_NUMBER, CURRENT_BLOCK_NUMBER_FOR_VALIDATE,
CURRENT_BLOCK_TIMESTAMP, CURRENT_BLOCK_TIMESTAMP_FOR_VALIDATE, TEST_SEQUENCER_ADDRESS,
calldata_for_deploy_test,
get_syscall_resources,
trivial_external_entry_point_new,
CairoVersion,
CHAIN_ID_NAME,
CURRENT_BLOCK_NUMBER,
CURRENT_BLOCK_NUMBER_FOR_VALIDATE,
CURRENT_BLOCK_TIMESTAMP,
CURRENT_BLOCK_TIMESTAMP_FOR_VALIDATE,
TEST_SEQUENCER_ADDRESS,
};
use crate::transaction::constants::QUERY_VERSION_BASE_BIT;
use crate::transaction::objects::{
CommonAccountFields, DeprecatedTransactionInfo, TransactionInfo,
CommonAccountFields,
DeprecatedTransactionInfo,
TransactionInfo,
};
use crate::versioned_constants::VersionedConstants;
use crate::{check_entry_point_execution_error_for_custom_hint, nonce, retdata, storage_key};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use std::collections::{HashMap, HashSet};

use cairo_felt::Felt252;
use cairo_vm::hint_processor::builtin_hint_processor::builtin_hint_processor_definition::{
BuiltinHintProcessor, HintProcessorData,
BuiltinHintProcessor,
HintProcessorData,
};
use cairo_vm::hint_processor::builtin_hint_processor::hint_utils::get_ptr_from_var_name;
use cairo_vm::hint_processor::hint_processor_definition::{HintProcessorLogic, HintReference};
Expand All @@ -28,21 +29,45 @@ use crate::blockifier::block::BlockInfo;
use crate::context::TransactionContext;
use crate::execution::call_info::{CallInfo, OrderedEvent, OrderedL2ToL1Message};
use crate::execution::common_hints::{
extended_builtin_hint_processor, ExecutionMode, HintExecutionResult,
extended_builtin_hint_processor,
ExecutionMode,
HintExecutionResult,
};
use crate::execution::deprecated_syscalls::{
call_contract, delegate_call, delegate_l1_handler, deploy, emit_event, get_block_number,
get_block_timestamp, get_caller_address, get_contract_address, get_sequencer_address,
get_tx_info, get_tx_signature, library_call, library_call_l1_handler, replace_class,
send_message_to_l1, storage_read, storage_write, DeprecatedSyscallResult,
DeprecatedSyscallSelector, StorageReadResponse, StorageWriteResponse, SyscallRequest,
call_contract,
delegate_call,
delegate_l1_handler,
deploy,
emit_event,
get_block_number,
get_block_timestamp,
get_caller_address,
get_contract_address,
get_sequencer_address,
get_tx_info,
get_tx_signature,
library_call,
library_call_l1_handler,
replace_class,
send_message_to_l1,
storage_read,
storage_write,
DeprecatedSyscallResult,
DeprecatedSyscallSelector,
StorageReadResponse,
StorageWriteResponse,
SyscallRequest,
SyscallResponse,
};
use crate::execution::entry_point::{CallEntryPoint, CallType, EntryPointExecutionContext};
use crate::execution::errors::{ConstructorEntryPointExecutionError, EntryPointExecutionError};
use crate::execution::execution_utils::{
felt_range_from_ptr, max_fee_for_execution_info, stark_felt_from_ptr, stark_felt_to_felt,
ReadOnlySegment, ReadOnlySegments,
felt_range_from_ptr,
max_fee_for_execution_info,
stark_felt_from_ptr,
stark_felt_to_felt,
ReadOnlySegment,
ReadOnlySegments,
};
use crate::execution::hint_code;
use crate::execution::syscalls::hint_processor::EmitEventError;
Expand Down
28 changes: 23 additions & 5 deletions crates/blockifier/src/execution/deprecated_syscalls/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,44 @@ use cairo_vm::vm::vm_core::VirtualMachine;
use serde::Deserialize;
use starknet_api::block::{BlockNumber, BlockTimestamp};
use starknet_api::core::{
calculate_contract_address, ClassHash, ContractAddress, EntryPointSelector, EthAddress,
calculate_contract_address,
ClassHash,
ContractAddress,
EntryPointSelector,
EthAddress,
};
use starknet_api::deprecated_contract_class::EntryPointType;
use starknet_api::hash::StarkFelt;
use starknet_api::state::StorageKey;
use starknet_api::transaction::{
Calldata, ContractAddressSalt, EventContent, EventData, EventKey, L2ToL1Payload,
Calldata,
ContractAddressSalt,
EventContent,
EventData,
EventKey,
L2ToL1Payload,
};
use strum_macros::EnumIter;

use self::hint_processor::{
execute_inner_call, execute_library_call, felt_to_bool, read_call_params, read_calldata,
read_felt_array, DeprecatedSyscallExecutionError, DeprecatedSyscallHintProcessor,
execute_inner_call,
execute_library_call,
felt_to_bool,
read_call_params,
read_calldata,
read_felt_array,
DeprecatedSyscallExecutionError,
DeprecatedSyscallHintProcessor,
};
use super::syscalls::exceeds_event_size_limit;
use crate::execution::call_info::{MessageToL1, OrderedEvent, OrderedL2ToL1Message};
use crate::execution::common_hints::ExecutionMode;
use crate::execution::entry_point::{CallEntryPoint, CallType, ConstructorContext};
use crate::execution::execution_utils::{
execute_deployment, stark_felt_from_ptr, write_maybe_relocatable, write_stark_felt,
execute_deployment,
stark_felt_from_ptr,
write_maybe_relocatable,
write_stark_felt,
ReadOnlySegment,
};

Expand Down
4 changes: 3 additions & 1 deletion crates/blockifier/src/execution/entry_point.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ use crate::context::{BlockContext, TransactionContext};
use crate::execution::call_info::CallInfo;
use crate::execution::common_hints::ExecutionMode;
use crate::execution::errors::{
ConstructorEntryPointExecutionError, EntryPointExecutionError, PreExecutionError,
ConstructorEntryPointExecutionError,
EntryPointExecutionError,
PreExecutionError,
};
use crate::execution::execution_utils::execute_entry_point_call;
use crate::state::state_api::State;
Expand Down
10 changes: 8 additions & 2 deletions crates/blockifier/src/execution/entry_point_execution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@ use starknet_api::stark_felt;
use crate::execution::call_info::{CallExecution, CallInfo, Retdata};
use crate::execution::contract_class::{ContractClassV1, EntryPointV1};
use crate::execution::entry_point::{
CallEntryPoint, EntryPointExecutionContext, EntryPointExecutionResult,
CallEntryPoint,
EntryPointExecutionContext,
EntryPointExecutionResult,
};
use crate::execution::errors::{EntryPointExecutionError, PostExecutionError, PreExecutionError};
use crate::execution::execution_utils::{
read_execution_retdata, stark_felt_to_felt, write_maybe_relocatable, write_stark_felt, Args,
read_execution_retdata,
stark_felt_to_felt,
write_maybe_relocatable,
write_stark_felt,
Args,
ReadOnlySegments,
};
use crate::execution::syscalls::hint_processor::SyscallHintProcessor;
Expand Down
15 changes: 12 additions & 3 deletions crates/blockifier/src/execution/entry_point_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,24 @@ use crate::test_utils::contracts::FeatureContract;
use crate::test_utils::dict_state_reader::DictStateReader;
use crate::test_utils::initial_test_state::test_state;
use crate::test_utils::{
create_calldata, trivial_external_entry_point_new, CairoVersion, NonceManager, BALANCE,
create_calldata,
trivial_external_entry_point_new,
CairoVersion,
NonceManager,
BALANCE,
};
use crate::transaction::account_transaction::AccountTransaction;
use crate::transaction::constants::{
EXECUTE_ENTRY_POINT_NAME, VALIDATE_DECLARE_ENTRY_POINT_NAME, VALIDATE_DEPLOY_ENTRY_POINT_NAME,
EXECUTE_ENTRY_POINT_NAME,
VALIDATE_DECLARE_ENTRY_POINT_NAME,
VALIDATE_DEPLOY_ENTRY_POINT_NAME,
VALIDATE_ENTRY_POINT_NAME,
};
use crate::transaction::test_utils::{
block_context, create_account_tx_for_validate_test, run_invoke_tx, FaultyAccountTxCreatorArgs,
block_context,
create_account_tx_for_validate_test,
run_invoke_tx,
FaultyAccountTxCreatorArgs,
INVALID,
};
use crate::transaction::transaction_types::TransactionType;
Expand Down
13 changes: 10 additions & 3 deletions crates/blockifier/src/execution/execution_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ use std::collections::HashMap;
use cairo_felt::Felt252;
use cairo_lang_runner::casm_run::format_next_item;
use cairo_vm::serde::deserialize_program::{
deserialize_array_of_bigint_hex, Attribute, HintParams, Identifier, ReferenceManager,
deserialize_array_of_bigint_hex,
Attribute,
HintParams,
Identifier,
ReferenceManager,
};
use cairo_vm::types::errors::program_errors::ProgramError;
use cairo_vm::types::program::Program;
Expand All @@ -24,8 +28,11 @@ use super::errors::ConstructorEntryPointExecutionError;
use crate::execution::call_info::{CallInfo, Retdata};
use crate::execution::contract_class::ContractClass;
use crate::execution::entry_point::{
execute_constructor_entry_point, CallEntryPoint, ConstructorContext,
EntryPointExecutionContext, EntryPointExecutionResult,
execute_constructor_entry_point,
CallEntryPoint,
ConstructorContext,
EntryPointExecutionContext,
EntryPointExecutionResult,
};
use crate::execution::errors::PostExecutionError;
use crate::execution::{deprecated_entry_point_execution, entry_point_execution};
Expand Down
Loading

0 comments on commit da50437

Please sign in to comment.