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

Jump to bottom

refactor: move log_entries to Call #2927

Merged
merged 1 commit into from
Sep 3, 2024
Merged

refactor: move log_entries to Call #2927

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions client/evm-tracing/src/formatters/blockscout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,6 @@ pub struct BlockscoutCall {
pub gas_used: U256,
#[serde(flatten)]
pub inner: BlockscoutCallInner,

pub logs: Vec<crate::types::single::Log>,
}
9 changes: 2 additions & 7 deletions client/evm-tracing/src/formatters/call_tracer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl super::ResponseFormatter for Formatter {
for entry in listener.entries.iter() {
let mut result: Vec<Call> = entry
.into_iter()
.map(|(entry_index, it)| {
.map(|(_, it)| {
let from = it.from;
let trace_address = it.trace_address.clone();
let value = it.value;
Expand Down Expand Up @@ -73,12 +73,7 @@ impl super::ResponseFormatter for Formatter {
res: res.clone(),
value: Some(value),
logs: match res {
CallResult::Output { .. } => {
match listener.log_entries.get(entry_index) {
Some(entry_logs) => entry_logs.clone(),
None => Vec::new(),
}
}
CallResult::Output { .. } => it.logs.clone(),
CallResult::Error { .. } => Vec::new(),
},
},
Expand Down
42 changes: 22 additions & 20 deletions client/evm-tracing/src/listeners/call_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ pub struct Listener {

/// If true the listener will collect EvmEvent::Log events.
pub with_log: bool,

/// Storage for all logs emitted by EvmEvent::Log events.
pub log_entries: BTreeMap<u32, Vec<Log>>,
}

struct Context {
Expand Down Expand Up @@ -123,7 +120,6 @@ impl Default for Listener {
call_list_first_transaction: true,
record_transaction_event_only: false,
with_log: false,
log_entries: BTreeMap::<u32, Vec<Log>>::new(),
}
}
}
Expand Down Expand Up @@ -168,6 +164,7 @@ impl Listener {
input: context.data,
res,
},
logs: Vec::<Log>::new(),
}
}
ContextType::Create => {
Expand All @@ -186,6 +183,7 @@ impl Listener {
init: context.data,
res,
},
logs: Vec::<Log>::new(),
}
}
};
Expand Down Expand Up @@ -216,6 +214,7 @@ impl Listener {
input: vec![],
res,
},
logs: Vec::<Log>::new(),
};

self.insert_entry(self.entries_next_index, entry);
Expand Down Expand Up @@ -500,6 +499,7 @@ impl Listener {
to: target,
balance,
},
logs: Vec::<Log>::new(),
},
);
self.entries_next_index += 1;
Expand Down Expand Up @@ -537,9 +537,9 @@ impl Listener {
topics,
data,
};
let key = self.entries_next_index.saturating_sub(1u32);
let key = self.entries_next_index;
if self.with_log {
self.insert_log_entry(&key, log);
self.insert_log_entry(key, log);
}
}

Expand All @@ -559,15 +559,13 @@ impl Listener {
}
}

fn insert_log_entry(&mut self, key: &u32, entry: Log) {
if let Some(entry_logs) = self.log_entries.get(key) {
let mut new_entry_logs: Vec<Log> = (*entry_logs.clone()).to_vec();
new_entry_logs.push(entry);
self.log_entries.insert(*key, new_entry_logs);
} else {
let mut logs_vec = Vec::<Log>::new();
logs_vec.push(entry);
self.log_entries.insert(*key, logs_vec);
fn insert_log_entry(&mut self, key: u32, log_entry: Log) {
if let Some(ref mut last) = self.entries.last_mut() {
if let Some(ref mut last_call) = last.get(&key) {
let mut call = (*last_call).clone();
call.logs.push(log_entry);
last.insert(key, call);
}
}
}

Expand Down Expand Up @@ -612,6 +610,7 @@ impl Listener {
input: context.data,
res,
},
logs: Vec::<Log>::new(),
}
}
ContextType::Create => {
Expand Down Expand Up @@ -640,6 +639,7 @@ impl Listener {
init: context.data,
res,
},
logs: Vec::<Log>::new(),
}
}
},
Expand Down Expand Up @@ -1183,9 +1183,10 @@ mod tests {
do_evm_call_event(&mut listener);
do_evm_log_event(&mut listener);
do_exit_event(&mut listener);
listener.finish_transaction();
assert_eq!(listener.entries.len(), 1);
assert_eq!(listener.log_entries.get(&1).is_some(), true);
assert_eq!(listener.log_entries.get(&1).unwrap().len(), 1);
assert_eq!(listener.entries[0].len(), 2);
assert_eq!(listener.entries[0].get(&1).unwrap().logs.len(), 1);
}

#[test]
Expand All @@ -1199,9 +1200,10 @@ mod tests {
do_evm_log_event(&mut listener);
do_evm_log_event(&mut listener);
do_exit_event(&mut listener);
listener.finish_transaction();
assert_eq!(listener.entries.len(), 1);
assert_eq!(listener.log_entries.get(&1).is_some(), true);
assert_eq!(listener.log_entries.get(&1).unwrap().len(), 2);
assert_eq!(listener.entries[0].len(), 2);
assert_eq!(listener.entries[0].get(&1).unwrap().logs.len(), 2);
}

#[test]
Expand All @@ -1215,6 +1217,6 @@ mod tests {
do_evm_log_event(&mut listener);
do_exit_event(&mut listener);
assert_eq!(listener.entries.len(), 1);
assert_eq!(listener.log_entries.get(&0), None);
assert_eq!(listener.entries[0].get(&1).unwrap().logs.len(), 0);
}
}
Loading