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

chore(starknet_batcher): extract propose/validate block inputs into function #2306

Merged
merged 1 commit into from
Dec 10, 2024
Merged

chore(starknet_batcher): extract propose/validate block inputs into function #2306

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
73 changes: 24 additions & 49 deletions crates/starknet_batcher/src/batcher_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,24 @@ fn deadline() -> chrono::DateTime<Utc> {
chrono::Utc::now() + BLOCK_GENERATION_TIMEOUT
}

fn propose_block_input() -> ProposeBlockInput {
ProposeBlockInput {
proposal_id: PROPOSAL_ID,
deadline: deadline(),
retrospective_block_hash: None,
block_info: initial_block_info(),
}
}

fn validate_block_input() -> ValidateBlockInput {
ValidateBlockInput {
proposal_id: PROPOSAL_ID,
deadline: deadline(),
retrospective_block_hash: None,
block_info: initial_block_info(),
}
}

struct MockDependencies {
storage_reader: MockBatcherStorageReaderTrait,
storage_writer: MockBatcherStorageWriterTrait,
Expand Down Expand Up @@ -230,24 +248,10 @@ async fn no_active_height() {

// Calling `propose_block` and `validate_block` without starting a height should fail.

let result = batcher
.propose_block(ProposeBlockInput {
proposal_id: ProposalId(0),
retrospective_block_hash: None,
deadline: chrono::Utc::now() + chrono::Duration::seconds(1),
block_info: Default::default(),
})
.await;
let result = batcher.propose_block(propose_block_input()).await;
assert_eq!(result, Err(BatcherError::NoActiveHeight));

let result = batcher
.validate_block(ValidateBlockInput {
proposal_id: ProposalId(0),
retrospective_block_hash: None,
deadline: chrono::Utc::now() + chrono::Duration::seconds(1),
block_info: Default::default(),
})
.await;
let result = batcher.validate_block(validate_block_input()).await;
assert_eq!(result, Err(BatcherError::NoActiveHeight));
}

Expand All @@ -263,14 +267,7 @@ async fn validate_block_full_flow() {
});

batcher.start_height(StartHeightInput { height: INITIAL_HEIGHT }).await.unwrap();

let validate_block_input = ValidateBlockInput {
proposal_id: PROPOSAL_ID,
deadline: deadline(),
retrospective_block_hash: None,
block_info: initial_block_info(),
};
batcher.validate_block(validate_block_input).await.unwrap();
batcher.validate_block(validate_block_input()).await.unwrap();

let send_proposal_input_txs = SendProposalContentInput {
proposal_id: PROPOSAL_ID,
Expand Down Expand Up @@ -387,14 +384,7 @@ async fn send_finish_to_an_invalid_proposal() {
..Default::default()
});
batcher.start_height(StartHeightInput { height: INITIAL_HEIGHT }).await.unwrap();

let validate_block_input = ValidateBlockInput {
proposal_id: PROPOSAL_ID,
deadline: deadline(),
retrospective_block_hash: None,
block_info: initial_block_info(),
};
batcher.validate_block(validate_block_input).await.unwrap();
batcher.validate_block(validate_block_input()).await.unwrap();

let send_proposal_input_txs =
SendProposalContentInput { proposal_id: PROPOSAL_ID, content: SendProposalContent::Finish };
Expand Down Expand Up @@ -424,15 +414,7 @@ async fn propose_block_full_flow() {
});

batcher.start_height(StartHeightInput { height: INITIAL_HEIGHT }).await.unwrap();
batcher
.propose_block(ProposeBlockInput {
proposal_id: PROPOSAL_ID,
retrospective_block_hash: None,
deadline: chrono::Utc::now() + chrono::Duration::seconds(1),
block_info: initial_block_info(),
})
.await
.unwrap();
batcher.propose_block(propose_block_input()).await.unwrap();

let expected_n_chunks = expected_streamed_txs.len().div_ceil(STREAMING_CHUNK_SIZE);
let mut aggregated_streamed_txs = Vec::new();
Expand Down Expand Up @@ -480,14 +462,7 @@ async fn propose_block_without_retrospective_block_hash() {
.start_height(StartHeightInput { height: BlockNumber(constants::STORED_BLOCK_HASH_BUFFER) })
.await
.unwrap();
let result = batcher
.propose_block(ProposeBlockInput {
proposal_id: PROPOSAL_ID,
retrospective_block_hash: None,
deadline: deadline(),
block_info: Default::default(),
})
.await;
let result = batcher.propose_block(propose_block_input()).await;

assert_matches!(result, Err(BatcherError::MissingRetrospectiveBlockHash));
}
Expand Down
Loading