eth/tracers: make native calltracer default (ethereum#23867)

DODOEX · Nov 26, 2021 · 342540a · 342540a
1 parent 7bcc275
commit 342540a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go
@@ -329,7 +329,7 @@ func TestOverriddenTraceCall(t *testing.T) {
 		tx, _ := types.SignTx(types.NewTransaction(uint64(i), accounts[1].addr, big.NewInt(1000), params.TxGas, b.BaseFee(), nil), signer, accounts[0].key)
 		b.AddTx(tx)
 	}))
-	randomAccounts, tracer := newAccounts(3), "callTracer"
+	randomAccounts, tracer := newAccounts(3), "callTracerJs"
 
 	var testSuite = []struct {
 		blockNumber rpc.BlockNumber

diff --git a/eth/tracers/internal/tracers/assets.go b/eth/tracers/internal/tracers/assets.go
diff --git a/eth/tracers/internal/tracers/call_tracer.js → ...racers/internal/tracers/call_tracer_js.js b/eth/tracers/internal/tracers/call_tracer.js → ...racers/internal/tracers/call_tracer_js.js
diff --git a/eth/tracers/native/call.go b/eth/tracers/native/call.go
@@ -31,7 +31,7 @@ import (
 )
 
 func init() {
-	tracers.RegisterNativeTracer("callTracerNative", NewCallTracer)
+	tracers.RegisterNativeTracer("callTracer", NewCallTracer)
 }
 
 type callFrame struct {

diff --git a/eth/tracers/testing/calltrace_test.go b/eth/tracers/testing/calltrace_test.go
@@ -61,12 +61,12 @@ func TestCallTracerLegacy(t *testing.T) {
 	testCallTracer("callTracerLegacy", "call_tracer_legacy", t)
 }
 
-func TestCallTracer(t *testing.T) {
-	testCallTracer("callTracer", "call_tracer", t)
+func TestCallTracerJs(t *testing.T) {
+	testCallTracer("callTracerJs", "call_tracer", t)
 }
 
 func TestCallTracerNative(t *testing.T) {
-	testCallTracer("callTracerNative", "call_tracer", t)
+	testCallTracer("callTracer", "call_tracer", t)
 }
 
 func testCallTracer(tracerName string, dirPath string, t *testing.T) {

diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go
@@ -148,7 +148,7 @@ func TestZeroValueToNotExitCall(t *testing.T) {
 	}
 	_, statedb := tests.MakePreState(rawdb.NewMemoryDatabase(), alloc, false)
 	// Create the tracer, the EVM environment and run it
-	tracer, err := New("callTracer", new(Context))
+	tracer, err := New("callTracerJs", new(Context))
 	if err != nil {
 		t.Fatalf("failed to create call tracer: %v", err)
 	}