Simplify Requester initialization from bootstrap

onflow · Nov 11, 2024 · bb7e00c · bb7e00c
1 parent 37cec8f
commit bb7e00c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
@@ -211,18 +211,13 @@ func (b *Bootstrap) StartAPIServer(ctx context.Context) error {
 		b.logger,
 	)
 
-	tracer, err := replayer.DefaultCallTracer()
-	if err != nil {
-		return err
-	}
 	blocksProvider := replayer.NewBlocksProvider(
 		b.storages.Blocks,
 		b.config.FlowNetworkID,
-		tracer,
+		nil,
 	)
 
 	evm, err := requester.NewEVM(
-		b.storages.Storage,
 		b.storages.Registers,
 		blocksProvider,
 		b.client,

diff --git a/services/requester/requester.go b/services/requester/requester.go
@@ -84,7 +84,6 @@ type Requester interface {
 var _ Requester = &EVM{}
 
 type EVM struct {
-	store          *pebble.Storage
 	registerStore  *pebble.RegisterStorage
 	blocksProvider *replayer.BlocksProvider
 	client         *CrossSporkClient
@@ -104,7 +103,6 @@ type EVM struct {
 }
 
 func NewEVM(
-	store *pebble.Storage,
 	registerStore *pebble.RegisterStorage,
 	blocksProvider *replayer.BlocksProvider,
 	client *CrossSporkClient,
@@ -165,7 +163,6 @@ func NewEVM(
 	}
 
 	evm := &EVM{
-		store:             store,
 		registerStore:     registerStore,
 		blocksProvider:    blocksProvider,
 		client:            client,
@@ -513,16 +510,11 @@ func (e *EVM) getSignerNetworkInfo(ctx context.Context) (uint32, uint64, error)
 }
 
 func (e *EVM) getBlockView(evmHeight uint64) (*query.View, error) {
-	blocksProvider := replayer.NewBlocksProvider(
-		e.blocks,
-		e.config.FlowNetworkID,
-		nil,
-	)
 	viewProvider := query.NewViewProvider(
 		e.config.FlowNetworkID,
 		evm.StorageAccountAddress(e.config.FlowNetworkID),
 		e.registerStore,
-		blocksProvider,
+		e.blocksProvider,
 		120_000_000,
 	)