Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(starknet_integration_tests): extract test contracts #4009

Merged
merged 1 commit into from
Feb 9, 2025
Merged

refactor(starknet_integration_tests): extract test contracts #4009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 48 additions & 29 deletions crates/starknet_integration_tests/src/state_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,20 @@ impl StorageTestSetup {
chain_info: &ChainInfo,
path: Option<PathBuf>,
) -> Self {
let preset_test_contracts = PresetTestContracts::new();

let batcher_db_path = path.as_ref().map(|p| p.join("batcher"));
let ((_, mut batcher_storage_writer), batcher_storage_config, batcher_storage_handle) =
TestStorageBuilder::new(batcher_db_path)
.scope(StorageScope::StateOnly)
.chain_id(chain_info.chain_id.clone())
.build();
create_test_state(&mut batcher_storage_writer, chain_info, test_defined_accounts.clone());
create_test_state(
&mut batcher_storage_writer,
chain_info,
test_defined_accounts.clone(),
preset_test_contracts.clone(),
);

let state_sync_db_path = path.as_ref().map(|p| p.join("state_sync"));
let (
Expand All @@ -79,7 +86,12 @@ impl StorageTestSetup {
.scope(StorageScope::FullArchive)
.chain_id(chain_info.chain_id.clone())
.build();
create_test_state(&mut state_sync_storage_writer, chain_info, test_defined_accounts);
create_test_state(
&mut state_sync_storage_writer,
chain_info,
test_defined_accounts,
preset_test_contracts,
);

// TODO(Yair): restructure this.
let persistent_root_handle = tempfile::tempdir().unwrap();
Expand Down Expand Up @@ -111,44 +123,51 @@ fn create_test_state(
storage_writer: &mut StorageWriter,
chain_info: &ChainInfo,
test_defined_accounts: Vec<AccountTransactionGenerator>,
preset_test_contracts: PresetTestContracts,
) {
let into_contract = |contract: FeatureContract| Contract {
contract,
sender_address: contract.get_instance_address(0),
};
let default_test_contracts = [
FeatureContract::TestContract(CairoVersion::Cairo0),
FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm)),
]
.into_iter()
.map(into_contract)
.collect();

let erc20_contract = FeatureContract::ERC20(CairoVersion::Cairo0);
let erc20_contract = into_contract(erc20_contract);

initialize_papyrus_test_state(
storage_writer,
chain_info,
test_defined_accounts,
default_test_contracts,
erc20_contract,
preset_test_contracts,
);
}

#[derive(Clone)]
struct PresetTestContracts {
pub default_test_contracts: Vec<Contract>,
pub erc20_contract: Contract,
}

impl PresetTestContracts {
pub fn new() -> Self {
let into_contract = |contract: FeatureContract| Contract {
contract,
sender_address: contract.get_instance_address(0),
};
let default_test_contracts = [
FeatureContract::TestContract(CairoVersion::Cairo0),
FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm)),
]
.into_iter()
.map(into_contract)
.collect();

let erc20_contract = FeatureContract::ERC20(CairoVersion::Cairo0);
let erc20_contract = into_contract(erc20_contract);

Self { default_test_contracts, erc20_contract }
}
}

fn initialize_papyrus_test_state(
storage_writer: &mut StorageWriter,
chain_info: &ChainInfo,
test_defined_accounts: Vec<AccountTransactionGenerator>,
default_test_contracts: Vec<Contract>,
erc20_contract: Contract,
preset_test_contracts: PresetTestContracts,
) {
let state_diff = prepare_state_diff(
chain_info,
&test_defined_accounts,
&default_test_contracts,
&erc20_contract,
);
let state_diff = prepare_state_diff(chain_info, &test_defined_accounts, &preset_test_contracts);
let PresetTestContracts { default_test_contracts, erc20_contract } = preset_test_contracts;

let contract_classes_to_retrieve = test_defined_accounts
.into_iter()
Expand All @@ -171,10 +190,10 @@ fn initialize_papyrus_test_state(
fn prepare_state_diff(
chain_info: &ChainInfo,
test_defined_accounts: &[AccountTransactionGenerator],
default_test_contracts: &[Contract],
erc20_contract: &Contract,
preset_test_contracts: &PresetTestContracts,
) -> ThinStateDiff {
let mut state_diff_builder = ThinStateDiffBuilder::new(chain_info);
let PresetTestContracts { default_test_contracts, erc20_contract } = preset_test_contracts;

// Setup the common test contracts that are used by default in all test invokes.
// TODO(batcher): this does nothing until we actually start excuting stuff in the batcher.
Expand Down