Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

fix get_sorted_events bug #912

Merged
merged 5 commits into from
Aug 9, 2023
Merged
Changes from all commits
Commits
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
31 changes: 27 additions & 4 deletions src/execution/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl CallInfo {
calls
}

/// Returns a list of StarkNet Event objects collected during the execution, sorted by the order
/// Returns a list of Starknet Event objects collected during the execution, sorted by the order
/// in which they were emitted.
pub fn get_sorted_events(&self) -> Result<Vec<Event>, TransactionError> {
let calls = self.gen_call_topology();
Expand All @@ -127,8 +127,11 @@ impl CallInfo {
for call in calls {
for ordered_event in call.events {
let event = Event::new(ordered_event.clone(), call.contract_address.clone());
starknet_events.remove(ordered_event.order as usize - 1);
starknet_events.insert(ordered_event.order as usize - 1, Some(event));
starknet_events.remove((ordered_event.order as isize - 1).max(0) as usize);
starknet_events.insert(
(ordered_event.order as isize - 1).max(0) as usize,
Some(event),
);
}
}

Expand All @@ -140,7 +143,7 @@ impl CallInfo {
Ok(starknet_events.into_iter().flatten().collect())
}

/// Returns a list of StarkNet L2ToL1MessageInfo objects collected during the execution, sorted
/// Returns a list of Starknet L2ToL1MessageInfo objects collected during the execution, sorted
/// by the order in which they were sent.
pub fn get_sorted_l2_to_l1_messages(&self) -> Result<Vec<L2toL1MessageInfo>, TransactionError> {
let calls = self.gen_call_topology();
Expand Down Expand Up @@ -613,6 +616,26 @@ mod tests {
use super::*;
use crate::utils::{string_to_hash, Address};

#[test]
fn test_get_sorted_single_event() {
let address = Address(Felt252::zero());
let ordered_event = OrderedEvent::new(0, vec![], vec![]);
let event = Event::new(ordered_event.clone(), address.clone());
let internal_calls = vec![CallInfo {
events: vec![ordered_event],
..Default::default()
}];
let call_info = CallInfo {
contract_address: address,
internal_calls,
..Default::default()
};

let sorted_events = call_info.get_sorted_events().unwrap();

assert_eq!(sorted_events, vec![event]);
}

#[test]
fn non_optional_calls_test() {
let mut tx_info = TransactionExecutionInfo {
Expand Down