From 53f1a9e1e38930daa4ab78dd3c3af8e3c92d8f65 Mon Sep 17 00:00:00 2001
From: jsvisa <delweng@gmail.com>
Date: Mon, 19 Aug 2024 15:59:53 +0000
Subject: [PATCH] Revert "special for parity traces"

This reverts commit f646b87db6cfee0377e755ba31d4832d85cbc0f1.

Signed-off-by: jsvisa <delweng@gmail.com>
---
 eth/tracers/live/filter.go | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/eth/tracers/live/filter.go b/eth/tracers/live/filter.go
index 870e14e83c..0fafb4d9ff 100644
--- a/eth/tracers/live/filter.go
+++ b/eth/tracers/live/filter.go
@@ -30,8 +30,7 @@ func init() {
 }
 
 const (
-	tableSize    = 2 * 1024 * 1024 * 1024
-	parityTracer = "parityTracer"
+	tableSize = 2 * 1024 * 1024 * 1024
 )
 
 type traceResult struct {
@@ -67,7 +66,7 @@ type filter struct {
 	blockCh    chan uint64
 	stopCh     chan struct{}
 	tables     map[string]bool
-	traces     map[string][]interface{}
+	traces     map[string][]*traceResult
 	tracer     *native.MuxTracer
 	latest     atomic.Uint64
 	offset     atomic.Uint64
@@ -98,16 +97,12 @@ func toKVKey(name string, number uint64, hash common.Hash) []byte {
 	switch name {
 	case "callTracer":
 		typo = byte('C')
-	case "prestateTracer":
-		typo = byte('S')
 	case "flatCallTracer":
-		typo = byte('F')
-	case parityTracer:
 		typo = byte('P')
 	default:
 		panic("not supported yet")
 	}
-	// TODO: need some prefix?
+	// TODO: have some prefix?
 	key := append(encodeBlockNumber(number), hash.Bytes()...)
 	key = append(key, typo)
 
@@ -142,7 +137,7 @@ func newFilter(cfg json.RawMessage, backend tracers.Backend) (*tracing.Hooks, []
 
 	muxTracers := t.Tracers()
 	tables := make(map[string]bool, len(muxTracers))
-	traces := make(map[string][]interface{}, len(muxTracers))
+	traces := make(map[string][]*traceResult, len(muxTracers))
 	for name := range muxTracers {
 		tables[toTraceTable(name)] = false
 		traces[name] = nil
@@ -235,7 +230,7 @@ func (f *filter) OnBlockStart(ev tracing.BlockEvent) {
 	// reset local cache
 	txs := ev.Block.Transactions().Len()
 	for name := range f.traces {
-		f.traces[name] = make([]interface{}, 0, txs)
+		f.traces[name] = make([]*traceResult, 0, txs)
 	}
 
 	// save the earliest arrived blknum as the offset
@@ -257,12 +252,8 @@ func (f *filter) OnTxEnd(receipt *types.Receipt, err error) {
 	for name, tt := range f.tracer.Tracers() {
 		trace := &traceResult{TxHash: receipt.TxHash}
 		result, err := tt.GetResult()
-		if name == parityTracer {
-			f.traces[name] = append(f.traces[name], result)
-			continue
-		}
 		if err != nil {
-			log.Error("Failed to get tracer result", "number", f.latest.Load(), "txhash", receipt.TxHash, "error", err)
+			log.Error("Failed to get tracer results", "number", f.latest.Load(), "error", err)
 			trace.Error = err.Error()
 		} else {
 			trace.Result = result