chore: remove public imports from starknet api transaction

starkware-libs · Nov 7, 2024 · 4e59211 · 4e59211
1 parent 86cb4a4
commit 4e59211
Show file tree

Hide file tree

Showing 112 changed files with 298 additions and 273 deletions.
diff --git a/crates/blockifier/src/blockifier/stateful_validator_test.rs b/crates/blockifier/src/blockifier/stateful_validator_test.rs
@@ -1,6 +1,7 @@
 use assert_matches::assert_matches;
 use rstest::rstest;
-use starknet_api::transaction::{TransactionVersion, ValidResourceBounds};
+use starknet_api::transaction::fields::ValidResourceBounds;
+use starknet_api::transaction::TransactionVersion;
 
 use crate::blockifier::stateful_validator::StatefulValidator;
 use crate::context::BlockContext;

diff --git a/crates/blockifier/src/blockifier/transaction_executor_test.rs b/crates/blockifier/src/blockifier/transaction_executor_test.rs
@@ -2,7 +2,8 @@ use assert_matches::assert_matches;
 use pretty_assertions::assert_eq;
 use rstest::rstest;
 use starknet_api::test_utils::NonceManager;
-use starknet_api::transaction::{Fee, TransactionVersion};
+use starknet_api::transaction::fields::Fee;
+use starknet_api::transaction::TransactionVersion;
 use starknet_api::{declare_tx_args, deploy_account_tx_args, felt, invoke_tx_args, nonce};
 use starknet_types_core::felt::Felt;
 

diff --git a/crates/blockifier/src/bouncer_test.rs b/crates/blockifier/src/bouncer_test.rs
@@ -4,7 +4,7 @@ use assert_matches::assert_matches;
 use cairo_vm::types::builtin_name::BuiltinName;
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use rstest::rstest;
-use starknet_api::transaction::Fee;
+use starknet_api::transaction::fields::Fee;
 use starknet_api::{class_hash, contract_address, storage_key};
 
 use super::BouncerConfig;

diff --git a/crates/blockifier/src/concurrency/fee_utils.rs b/crates/blockifier/src/concurrency/fee_utils.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use num_traits::ToPrimitive;
 use starknet_api::core::ContractAddress;
-use starknet_api::transaction::Fee;
+use starknet_api::transaction::fields::Fee;
 use starknet_types_core::felt::Felt;
 
 use crate::context::{BlockContext, TransactionContext};

diff --git a/crates/blockifier/src/concurrency/fee_utils_test.rs b/crates/blockifier/src/concurrency/fee_utils_test.rs
@@ -1,6 +1,6 @@
 use num_bigint::BigUint;
 use rstest::rstest;
-use starknet_api::transaction::{Fee, ValidResourceBounds};
+use starknet_api::transaction::fields::{Fee, ValidResourceBounds};
 use starknet_api::{felt, invoke_tx_args};
 use starknet_types_core::felt::Felt;
 
@@ -56,7 +56,7 @@ pub fn test_fill_sequencer_balance_reads(
 #[case::overflow(Fee(150_u128), felt!(u128::MAX), felt!(5_u128))]
 #[case::overflow_edge_case(Fee(500_u128), felt!(u128::MAX), felt!(u128::MAX-1))]
 pub fn test_add_fee_to_sequencer_balance(
-    #[case] actual_fee: starknet_api::transaction::Fee,
+    #[case] actual_fee: Fee,
     #[case] sequencer_balance_low: Felt,
     #[case] sequencer_balance_high: Felt,
 ) {

diff --git a/crates/blockifier/src/concurrency/versioned_state_test.rs b/crates/blockifier/src/concurrency/versioned_state_test.rs
@@ -6,7 +6,7 @@ use assert_matches::assert_matches;
 use rstest::{fixture, rstest};
 use starknet_api::core::{calculate_contract_address, ClassHash, ContractAddress};
 use starknet_api::test_utils::NonceManager;
-use starknet_api::transaction::{ContractAddressSalt, ValidResourceBounds};
+use starknet_api::transaction::fields::{ContractAddressSalt, ValidResourceBounds};
 use starknet_api::{
     calldata,
     class_hash,

diff --git a/crates/blockifier/src/concurrency/worker_logic_test.rs b/crates/blockifier/src/concurrency/worker_logic_test.rs
@@ -4,12 +4,8 @@ use std::sync::Mutex;
 use rstest::rstest;
 use starknet_api::core::{ContractAddress, Nonce};
 use starknet_api::test_utils::NonceManager;
-use starknet_api::transaction::{
-    ContractAddressSalt,
-    Fee,
-    TransactionVersion,
-    ValidResourceBounds,
-};
+use starknet_api::transaction::fields::{ContractAddressSalt, Fee, ValidResourceBounds};
+use starknet_api::transaction::TransactionVersion;
 use starknet_api::{contract_address, declare_tx_args, felt, invoke_tx_args, nonce, storage_key};
 use starknet_types_core::felt::Felt;
 

diff --git a/crates/blockifier/src/context.rs b/crates/blockifier/src/context.rs
@@ -5,7 +5,11 @@ use papyrus_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use serde::{Deserialize, Serialize};
 use starknet_api::block::GasPriceVector;
 use starknet_api::core::{ChainId, ContractAddress};
-use starknet_api::transaction::{AllResourceBounds, GasVectorComputationMode, ValidResourceBounds};
+use starknet_api::transaction::fields::{
+    AllResourceBounds,
+    GasVectorComputationMode,
+    ValidResourceBounds,
+};
 
 use crate::blockifier::block::BlockInfo;
 use crate::bouncer::BouncerConfig;

diff --git a/crates/blockifier/src/execution/contract_address_test.rs b/crates/blockifier/src/execution/contract_address_test.rs
@@ -1,6 +1,6 @@
 use rstest::rstest;
 use starknet_api::core::{calculate_contract_address, ClassHash, ContractAddress};
-use starknet_api::transaction::{Calldata, ContractAddressSalt};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
 use starknet_api::{calldata, felt};
 
 use crate::abi::abi_utils::selector_from_name;

diff --git a/crates/blockifier/src/execution/deprecated_syscalls/deprecated_syscalls_test.rs b/crates/blockifier/src/execution/deprecated_syscalls/deprecated_syscalls_test.rs
@@ -7,13 +7,11 @@ use pretty_assertions::assert_eq;
 use rstest::rstest;
 use starknet_api::core::{calculate_contract_address, ChainId};
 use starknet_api::state::StorageKey;
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt, Fee};
 use starknet_api::transaction::{
-    Calldata,
-    ContractAddressSalt,
     EventContent,
     EventData,
     EventKey,
-    Fee,
     TransactionHash,
     TransactionVersion,
     QUERY_VERSION_BASE_BIT,

diff --git a/crates/blockifier/src/execution/deprecated_syscalls/hint_processor.rs b/crates/blockifier/src/execution/deprecated_syscalls/hint_processor.rs
@@ -20,7 +20,7 @@ use num_bigint::{BigUint, TryFromBigIntError};
 use starknet_api::contract_class::EntryPointType;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_api::StarknetApiError;
 use starknet_types_core::felt::{Felt, FromStrError};
 use thiserror::Error;

diff --git a/crates/blockifier/src/execution/deprecated_syscalls/mod.rs b/crates/blockifier/src/execution/deprecated_syscalls/mod.rs
@@ -11,14 +11,8 @@ use starknet_api::core::{
     EthAddress,
 };
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{
-    Calldata,
-    ContractAddressSalt,
-    EventContent,
-    EventData,
-    EventKey,
-    L2ToL1Payload,
-};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
+use starknet_api::transaction::{EventContent, EventData, EventKey, L2ToL1Payload};
 use starknet_types_core::felt::Felt;
 use strum_macros::EnumIter;
 

diff --git a/crates/blockifier/src/execution/entry_point.rs b/crates/blockifier/src/execution/entry_point.rs
@@ -9,13 +9,13 @@ use serde::Serialize;
 use starknet_api::contract_class::EntryPointType;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     AllResourceBounds,
     Calldata,
     ResourceBounds,
-    TransactionVersion,
     ValidResourceBounds,
 };
+use starknet_api::transaction::TransactionVersion;
 use starknet_types_core::felt::Felt;
 
 use crate::abi::abi_utils::selector_from_name;

diff --git a/crates/blockifier/src/execution/entry_point_test.rs b/crates/blockifier/src/execution/entry_point_test.rs
@@ -5,7 +5,7 @@ use num_bigint::BigInt;
 use pretty_assertions::assert_eq;
 use starknet_api::core::EntryPointSelector;
 use starknet_api::execution_utils::format_panic_data;
-use starknet_api::transaction::{Calldata, Fee};
+use starknet_api::transaction::fields::{Calldata, Fee};
 use starknet_api::{calldata, felt, storage_key};
 
 use crate::abi::abi_utils::{get_storage_var_address, selector_from_name};

diff --git a/crates/blockifier/src/execution/execution_utils.rs b/crates/blockifier/src/execution/execution_utils.rs
@@ -18,7 +18,7 @@ use cairo_vm::vm::vm_core::VirtualMachine;
 use num_bigint::BigUint;
 use starknet_api::core::ClassHash;
 use starknet_api::deprecated_contract_class::Program as DeprecatedProgram;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use starknet_types_core::felt::Felt;
 
 use super::call_info::CallExecution;

diff --git a/crates/blockifier/src/execution/stack_trace_test.rs b/crates/blockifier/src/execution/stack_trace_test.rs
@@ -9,13 +9,13 @@ use starknet_api::core::{
     EntryPointSelector,
     Nonce,
 };
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     ContractAddressSalt,
     Fee,
     TransactionSignature,
-    TransactionVersion,
     ValidResourceBounds,
 };
+use starknet_api::transaction::TransactionVersion;
 use starknet_api::{calldata, felt, invoke_tx_args};
 use starknet_types_core::felt::Felt;
 

diff --git a/crates/blockifier/src/execution/syscalls/hint_processor.rs b/crates/blockifier/src/execution/syscalls/hint_processor.rs
@@ -16,7 +16,12 @@ use cairo_vm::vm::vm_core::VirtualMachine;
 use starknet_api::contract_class::EntryPointType;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{AllResourceBounds, Calldata, Resource, ValidResourceBounds};
+use starknet_api::transaction::fields::{
+    AllResourceBounds,
+    Calldata,
+    Resource,
+    ValidResourceBounds,
+};
 use starknet_api::StarknetApiError;
 use starknet_types_core::felt::{Felt, FromStrError};
 use thiserror::Error;

diff --git a/crates/blockifier/src/execution/syscalls/mod.rs b/crates/blockifier/src/execution/syscalls/mod.rs
@@ -11,14 +11,8 @@ use starknet_api::core::{
     EthAddress,
 };
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::{
-    Calldata,
-    ContractAddressSalt,
-    EventContent,
-    EventData,
-    EventKey,
-    L2ToL1Payload,
-};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
+use starknet_api::transaction::{EventContent, EventData, EventKey, L2ToL1Payload};
 use starknet_types_core::felt::Felt;
 
 use self::hint_processor::{

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs
@@ -6,7 +6,7 @@ use pretty_assertions::assert_eq;
 use rstest::rstest;
 use starknet_api::execution_utils::format_panic_data;
 use starknet_api::felt;
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use super::constants::REQUIRED_GAS_CALL_CONTRACT_TEST;

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs
@@ -1,6 +1,6 @@
 use pretty_assertions::assert_eq;
 use starknet_api::core::calculate_contract_address;
-use starknet_api::transaction::{Calldata, ContractAddressSalt, Fee};
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt, Fee};
 use starknet_api::{calldata, felt};
 use test_case::test_case;
 

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs
@@ -1,7 +1,8 @@
 use itertools::concat;
 use pretty_assertions::assert_eq;
 use starknet_api::felt;
-use starknet_api::transaction::{Calldata, EventContent, EventData, EventKey};
+use starknet_api::transaction::fields::Calldata;
+use starknet_api::transaction::{EventContent, EventData, EventKey};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;
 

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs
@@ -4,19 +4,17 @@ use starknet_api::block::GasPrice;
 use starknet_api::core::ChainId;
 use starknet_api::data_availability::DataAvailabilityMode;
 use starknet_api::execution_resources::GasAmount;
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     AccountDeploymentData,
     Calldata,
     Fee,
     PaymasterData,
     Resource,
     ResourceBounds,
     Tip,
-    TransactionHash,
-    TransactionVersion,
     ValidResourceBounds,
-    QUERY_VERSION_BASE_BIT,
 };
+use starknet_api::transaction::{TransactionHash, TransactionVersion, QUERY_VERSION_BASE_BIT};
 use starknet_api::{felt, nonce};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/keccak.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/keccak.rs
@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs
@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/send_message_to_l1.rs
@@ -1,7 +1,8 @@
 use itertools::concat;
 use starknet_api::core::EthAddress;
 use starknet_api::felt;
-use starknet_api::transaction::{Calldata, L2ToL1Payload};
+use starknet_api::transaction::fields::Calldata;
+use starknet_api::transaction::L2ToL1Payload;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs
@@ -1,4 +1,4 @@
-use starknet_api::transaction::Calldata;
+use starknet_api::transaction::fields::Calldata;
 use test_case::test_case;
 
 use crate::abi::abi_utils::selector_from_name;

diff --git a/crates/blockifier/src/fee/fee_checks.rs b/crates/blockifier/src/fee/fee_checks.rs
@@ -1,6 +1,11 @@
 use starknet_api::execution_resources::{GasAmount, GasVector};
-use starknet_api::transaction::Resource::{self, L1DataGas, L1Gas, L2Gas};
-use starknet_api::transaction::{AllResourceBounds, Fee, ResourceBounds, ValidResourceBounds};
+use starknet_api::transaction::fields::Resource::{self, L1DataGas, L1Gas, L2Gas};
+use starknet_api::transaction::fields::{
+    AllResourceBounds,
+    Fee,
+    ResourceBounds,
+    ValidResourceBounds,
+};
 use starknet_types_core::felt::Felt;
 use thiserror::Error;
 

diff --git a/crates/blockifier/src/fee/fee_test.rs b/crates/blockifier/src/fee/fee_test.rs
@@ -4,7 +4,7 @@ use rstest::rstest;
 use starknet_api::block::{GasPrice, NonzeroGasPrice};
 use starknet_api::execution_resources::{GasAmount, GasVector};
 use starknet_api::invoke_tx_args;
-use starknet_api::transaction::{
+use starknet_api::transaction::fields::{
     AllResourceBounds,
     Fee,
     GasVectorComputationMode,

diff --git a/crates/blockifier/src/fee/fee_utils.rs b/crates/blockifier/src/fee/fee_utils.rs
@@ -6,8 +6,8 @@ use num_bigint::BigUint;
 use starknet_api::core::ContractAddress;
 use starknet_api::execution_resources::GasVector;
 use starknet_api::state::StorageKey;
-use starknet_api::transaction::ValidResourceBounds::{AllResources, L1Gas};
-use starknet_api::transaction::{Fee, GasVectorComputationMode, Resource};
+use starknet_api::transaction::fields::ValidResourceBounds::{AllResources, L1Gas};
+use starknet_api::transaction::fields::{Fee, GasVectorComputationMode, Resource};
 use starknet_types_core::felt::Felt;
 
 use crate::abi::abi_utils::get_fee_token_var_address;

diff --git a/crates/blockifier/src/fee/gas_usage.rs b/crates/blockifier/src/fee/gas_usage.rs
@@ -1,6 +1,6 @@
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use starknet_api::execution_resources::GasVector;
-use starknet_api::transaction::GasVectorComputationMode;
+use starknet_api::transaction::fields::GasVectorComputationMode;
 
 use super::fee_utils::get_vm_resources_cost;
 use crate::abi::constants;

diff --git a/crates/blockifier/src/fee/gas_usage_test.rs b/crates/blockifier/src/fee/gas_usage_test.rs
@@ -6,7 +6,8 @@ use rstest::{fixture, rstest};
 use starknet_api::block::StarknetVersion;
 use starknet_api::execution_resources::{GasAmount, GasVector};
 use starknet_api::invoke_tx_args;
-use starknet_api::transaction::{EventContent, EventData, EventKey, GasVectorComputationMode};
+use starknet_api::transaction::fields::GasVectorComputationMode;
+use starknet_api::transaction::{EventContent, EventData, EventKey};
 use starknet_types_core::felt::Felt;
 
 use crate::abi::constants;

diff --git a/crates/blockifier/src/fee/receipt.rs b/crates/blockifier/src/fee/receipt.rs
@@ -1,7 +1,7 @@
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use starknet_api::core::ContractAddress;
 use starknet_api::execution_resources::GasVector;
-use starknet_api::transaction::Fee;
+use starknet_api::transaction::fields::Fee;
 
 use crate::context::TransactionContext;
 use crate::execution::call_info::ExecutionSummary;

diff --git a/crates/blockifier/src/fee/receipt_test.rs b/crates/blockifier/src/fee/receipt_test.rs
@@ -1,6 +1,7 @@
 use rstest::{fixture, rstest};
 use starknet_api::execution_resources::GasVector;
-use starknet_api::transaction::{GasVectorComputationMode, L2ToL1Payload};
+use starknet_api::transaction::fields::GasVectorComputationMode;
+use starknet_api::transaction::L2ToL1Payload;
 use starknet_api::{invoke_tx_args, nonce};
 use starknet_types_core::felt::Felt;
 

diff --git a/crates/blockifier/src/fee/resources.rs b/crates/blockifier/src/fee/resources.rs
@@ -1,7 +1,7 @@
 use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use starknet_api::core::ContractAddress;
 use starknet_api::execution_resources::{GasAmount, GasVector};
-use starknet_api::transaction::GasVectorComputationMode;
+use starknet_api::transaction::fields::GasVectorComputationMode;
 
 use crate::execution::call_info::{EventSummary, ExecutionSummary};
 use crate::fee::eth_gas_constants;

diff --git a/crates/blockifier/src/state/cached_state_test.rs b/crates/blockifier/src/state/cached_state_test.rs
@@ -4,7 +4,7 @@ use assert_matches::assert_matches;
 use indexmap::indexmap;
 use pretty_assertions::assert_eq;
 use rstest::rstest;
-use starknet_api::transaction::Fee;
+use starknet_api::transaction::fields::Fee;
 use starknet_api::{class_hash, compiled_class_hash, contract_address, felt, nonce, storage_key};
 
 use crate::context::{BlockContext, ChainInfo};