fix: Remove duplicate FilterOld and consolidate on Filter

execution/types/log.go

@@ -191,41 +191,7 @@
 	return o
 }
 
-func (logs Logs) FilterOld(addresses map[common.Address]struct{}, topics [][]common.Hash) Logs {
-	result := make(Logs, 0, len(logs))
-	// populate a set of addresses
-Logs:
-	for _, log := range logs {
-		// empty address list means no filter
-		if len(addresses) > 0 {
-			// this is basically the includes function but done with a map
-			if _, ok := addresses[log.Address]; !ok {
-				continue
-			}
-		}
-		// If the to filtered topics is greater than the amount of topics in logs, skip.
-		if len(topics) > len(log.Topics) {
-			continue
-		}
-		for i, sub := range topics {
-			match := len(sub) == 0 // empty rule set == wildcard
-			// iterate over the subtopics and look for any match.
-			for _, topic := range sub {
-				if log.Topics[i] == topic {
-					match = true
-					break
-				}
-			}
-			// there was no match, so this log is invalid.
-			if !match {
-				continue Logs
-			}
-		}
-		result = append(result, log)
-	}
-	return result
-}
 
 type logMarshaling struct {
 	Data        hexutil.Bytes
 	BlockNumber hexutil.Uint64

execution/types/log_test.go

@@ -240,10 +240,10 @@
 		if !reflect.DeepEqual(ares, v.want) {
 			t.Errorf("Fail %s, got %v want %v", name, ares, v.want)
 		}
-		old_res := testFLExtractAddress(v.input.FilterOld(map[common.Address]struct{}{}, v.filter))
-		if !reflect.DeepEqual(old_res, v.want) {
-			t.Errorf("Fail Old %s, got %v want %v", name, old_res, v.want)
-		}
+		old_res := testFLExtractAddress(v.input.Filter(map[common.Address]struct{}{}, v.filter, 0))
+        if !reflect.DeepEqual(old_res, v.want) {
+            t.Errorf("Fail Old %s, got %v want %v", name, old_res, v.want)
+        }
 	}
 }