eth/filters: replace atomic pointer with value (#26689)

s1na · holiman · web-flow · commit ff38c9ee2ebe · 2023-02-14T15:48:22.000+02:00
* eth/filters: replace atomic.Pointer

* fix

* improve

Co-authored-by: Martin Holst Swende &lt;martin@swende.se&gt;

---------

Co-authored-by: Martin Holst Swende &lt;martin@swende.se&gt;
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
@@ -95,7 +95,7 @@ func NewFilterSystem(backend Backend, config Config) *FilterSystem {
 
 type logCacheElem struct {
 	logs []*types.Log
-	body atomic.Pointer[types.Body]
+	body atomic.Value
 }
 
 // cachedLogElem loads block logs from the backend and caches the result.
@@ -133,7 +133,7 @@ func (sys *FilterSystem) cachedLogElem(ctx context.Context, blockHash common.Has
 
 func (sys *FilterSystem) cachedGetBody(ctx context.Context, elem *logCacheElem, hash common.Hash, number uint64) (*types.Body, error) {
 	if body := elem.body.Load(); body != nil {
-		return body, nil
+		return body.(*types.Body), nil
 	}
 	body, err := sys.backend.GetBody(ctx, hash, rpc.BlockNumber(number))
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func NewFilterSystem(backend Backend, config Config) *FilterSystem {`
`95`	`95`
`96`	`96`	`type logCacheElem struct {`
`97`	`97`	`logs []*types.Log`
`98`		`- body atomic.Pointer[types.Body]`
	`98`	`+ body atomic.Value`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`// cachedLogElem loads block logs from the backend and caches the result.`
`@@ -133,7 +133,7 @@ func (sys *FilterSystem) cachedLogElem(ctx context.Context, blockHash common.Has`
`133`	`133`
`134`	`134`	`func (sys FilterSystem) cachedGetBody(ctx context.Context, elem logCacheElem, hash common.Hash, number uint64) (*types.Body, error) {`
`135`	`135`	`if body := elem.body.Load(); body != nil {`
`136`		`- return body, nil`
	`136`	`+ return body.(*types.Body), nil`
`137`	`137`	`}`
`138`	`138`	`body, err := sys.backend.GetBody(ctx, hash, rpc.BlockNumber(number))`
`139`	`139`	`if err != nil {`