Merge branch 'pg/add-tracing-support-2' into pg/evm-debug

paritytech · Jan 16, 2025 · 0189fb8 · 0189fb8
2 parents a37a5ef + ff7d0ec
commit 0189fb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
@@ -20,14 +20,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
 derive_more = { workspace = true }
 environmental = { workspace = true }
+ethabi = { workspace = true }
 ethereum-types = { workspace = true, features = ["codec", "rlp", "serialize"] }
 hex = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
 paste = { workspace = true }
 polkavm = { version = "0.18.0", default-features = false }
 rlp = { workspace = true }
-ethabi = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = [
 	"alloc",
@@ -76,6 +76,7 @@ default = ["std"]
 std = [
 	"codec/std",
 	"environmental/std",
+	"ethabi/std",
 	"ethereum-types/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",

diff --git a/substrate/frame/revive/src/debug.rs b/substrate/frame/revive/src/debug.rs
@@ -51,7 +51,7 @@ pub trait Tracing {
 	/// Called when a contract call terminates with an error
 	fn exit_child_span_with_error(&mut self, error: DispatchError, gas_left: Weight);
 
-	/// Takes the traces collected by the tracer and resets them.
+	/// Collects and returns the traces recorded by the tracer, then clears them.
 	fn collect_traces(&mut self) -> Traces;
 }
 

diff --git a/substrate/frame/revive/src/evm/api/debug_rpc_types.rs b/substrate/frame/revive/src/evm/api/debug_rpc_types.rs
@@ -102,7 +102,7 @@ impl<'de> Deserialize<'de> for TracerConfig {
 }
 
 #[test]
-fn test_deserialize_call_tracer_with_logs_true() {
+fn test_tracer_config_serialization() {
 	let tracers = vec![
 		(r#"{"tracer": "callTracer"}"#, TracerConfig::CallTracer { with_logs: true }),
 		(