jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace Option<Vec> with just vec (#3474)

Browse Source
This commit is contained in:
Matthias Seitz
2023-06-29 23:22:08 +02:00
committed by GitHub
parent 26b80f4f98
commit 40f2a51008
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/revm/revm-inspectors/src/tracing/builder/geth.rs
View File

@ -137,7 +137,7 @@ impl GethTraceBuilder {
// we need to ensure that calls are in order they are called: the last child node is
// the last call, but since we walk up the tree, we need to always
// insert at position 0
parent_frame.1.calls.get_or_insert_with(Vec::new).insert(0, call);
parent_frame.1.calls.insert(0, call);
} else {
debug_assert!(call_frames.is_empty(), "only one root node has no parent");
return call

25
crates/revm/revm-inspectors/src/tracing/types.rs
View File

@ -378,8 +378,8 @@ impl CallTraceNode {
output: Some(self.trace.output.clone().into()),
error: None,
revert_reason: None,
calls: None,
logs: None,
calls: Default::default(),
logs: Default::default(),
};
// we need to populate error and revert reason
@ -388,17 +388,16 @@ impl CallTraceNode {
call_frame.error = self.trace.as_error();
}
if include_logs {
call_frame.logs = Some(
self.logs
.iter()
.map(|log| CallLogFrame {
address: Some(self.trace.address),
topics: Some(log.topics.clone()),
data: Some(log.data.clone().into()),
})
.collect(),
);
if include_logs && !self.logs.is_empty() {
call_frame.logs = self
.logs
.iter()
.map(|log| CallLogFrame {
address: Some(self.trace.address),
topics: Some(log.topics.clone()),
data: Some(log.data.clone().into()),
})
.collect();
}
call_frame

11
crates/rpc/rpc-types/src/eth/trace/geth/call.rs
View File

@ -18,10 +18,10 @@ pub struct CallFrame {
pub error: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub revert_reason: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub calls: Option<Vec<CallFrame>>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub logs: Option<Vec<CallLogFrame>>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub calls: Vec<CallFrame>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub logs: Vec<CallLogFrame>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub value: Option<U256>,
#[serde(rename = "type")]
@ -83,7 +83,6 @@ mod tests {
let _trace: CallFrame = serde_json::from_str(DEFAULT).unwrap();
let _trace: CallFrame = serde_json::from_str(LEGACY).unwrap();
let _trace: CallFrame = serde_json::from_str(ONLY_TOP_CALL).unwrap();
let trace: CallFrame = serde_json::from_str(WITH_LOG).unwrap();
let _logs = trace.logs.unwrap();
let _trace: CallFrame = serde_json::from_str(WITH_LOG).unwrap();
}
}