Accept optional tracer in NewOverridableBlocksProvider constructor method

Author: m-Peter

api/debug.go

@@ -178,7 +178,9 @@ func (d *DebugAPI) TraceCall(
 	blocksProvider := requester.NewOverridableBlocksProvider(
 		d.blocks,
 		d.config.FlowNetworkID,
-	).WithTracer(tracer)
+		tracer,
+	)
+
 	if config.BlockOverrides != nil {
 		blocksProvider = blocksProvider.WithBlockOverrides(&ethTypes.BlockOverrides{
 			Number:   config.BlockOverrides.Number,

services/requester/overridable_blocks_provider.go

@@ -81,19 +81,12 @@ var _ evmTypes.BlockSnapshotProvider = (*OverridableBlocksProvider)(nil)
 func NewOverridableBlocksProvider(
 	blocks storage.BlockIndexer,
 	chainID flowGo.ChainID,
+	tracer *tracers.Tracer,
 ) *OverridableBlocksProvider {
 	return &OverridableBlocksProvider{
 		blocks:  blocks,
 		chainID: chainID,
-	}
-}
-
-func (bp *OverridableBlocksProvider) WithTracer(tracer *tracers.Tracer) *OverridableBlocksProvider {
-	return &OverridableBlocksProvider{
-		blocks:         bp.blocks,
-		chainID:        bp.chainID,
-		tracer:         tracer,
-		blockOverrides: bp.blockOverrides,
+		tracer:  tracer,
 	}
 }
 

services/requester/requester.go

@@ -440,7 +440,11 @@ func (e *EVM) getBlockView(
 	height uint64,
 	blockOverrides *ethTypes.BlockOverrides,
 ) (*query.View, error) {
-	blocksProvider := NewOverridableBlocksProvider(e.blocks, e.config.FlowNetworkID)
+	blocksProvider := NewOverridableBlocksProvider(
+		e.blocks,
+		e.config.FlowNetworkID,
+		nil,
+	)
 
 	if blockOverrides != nil {
 		blocksProvider = blocksProvider.WithBlockOverrides(blockOverrides)