refactor: remove skip_balance_check from run_test signature

This field is redundant, as it can be read directly from `config`
This commit is contained in:
adrian
2025-09-18 10:10:02 +02:00
committed by Adrian Benavides
parent a895d7e1fe
commit 9f4ff71b70
2 changed files with 9 additions and 12 deletions

View File

@@ -121,7 +121,7 @@ impl TestRunner {
for test in &tests {
info!("TEST {}: {}", count, test.name);
match self.run_test(test, &config, config.skip_balance_check) {
match self.run_test(test, &config) {
Ok(_) => {
info!("✅ {} passed\n", test.name);
}
@@ -159,7 +159,6 @@ impl TestRunner {
&self,
test: &IntegrationTest,
config: &IntegrationTestsConfig,
skip_balance_check: bool,
) -> miette::Result<()> {
self.empty_database()
.into_diagnostic()
@@ -195,12 +194,11 @@ impl TestRunner {
.wrap_err("Failed to run Tycho")?;
tycho_runner.run_with_rpc_server(
|expected_components, start_block, stop_block, skip_balance_check| {
|expected_components, start_block, stop_block| {
validate_state(
expected_components,
start_block,
stop_block,
skip_balance_check,
config,
&self.adapter_contract_builder,
self.vm_traces,
@@ -209,7 +207,6 @@ impl TestRunner {
&test.expected_components,
test.start_block,
test.stop_block,
skip_balance_check,
)?
}
@@ -233,7 +230,6 @@ fn validate_state(
expected_components: &Vec<ProtocolComponentWithTestConfig>,
start_block: u64,
stop_block: u64,
skip_balance_check: bool,
config: &IntegrationTestsConfig,
adapter_contract_builder: &AdapterContractBuilder,
vm_traces: bool,
@@ -290,7 +286,10 @@ fn validate_state(
// Step 1: Validate that all expected components are present on Tycho after indexing
debug!("Validating {:?} expected components", expected_components.len());
for expected_component in expected_components {
let component_id = expected_component.base.id.to_lowercase();
let component_id = expected_component
.base
.id
.to_lowercase();
let component = components_by_id
.get(&component_id)
@@ -315,7 +314,7 @@ fn validate_state(
info!("All expected components were successfully found on Tycho and match the expected state");
// Step 2: Validate Token Balances
match skip_balance_check {
match config.skip_balance_check {
true => info!("Skipping balance check"),
false => {
validate_token_balances(&components_by_id, &protocol_states_by_id, start_block, &rt)?;
@@ -545,7 +544,6 @@ fn validate_state(
}
}
}
info!("✅ Simulation validation passed");
Ok(())
}

View File

@@ -98,10 +98,9 @@ impl TychoRunner {
expected_components: &Vec<ProtocolComponentWithTestConfig>,
start_block: u64,
stop_block: u64,
skip_balance_check: bool,
) -> miette::Result<R>
where
F: FnOnce(&Vec<ProtocolComponentWithTestConfig>, u64, u64, bool) -> R,
F: FnOnce(&Vec<ProtocolComponentWithTestConfig>, u64, u64) -> R,
{
let (tx, rx): (Sender<bool>, Receiver<bool>) = mpsc::channel();
let db_url = self.db_url.clone();
@@ -141,7 +140,7 @@ impl TychoRunner {
thread::sleep(Duration::from_secs(3));
// Run the provided function
let result = func(expected_components, start_block, stop_block, skip_balance_check);
let result = func(expected_components, start_block, stop_block);
tx.send(true)
.expect("Failed to send termination message");