Fix up

Author: davidcauchi

sentinel/internal/interface.go sentinel/api/blockchain_client.gosentinel/internal/interface.go renamed to sentinel/api/blockchain_client.go

@@ -1,5 +1,5 @@
-// File: internal/interface.go
-package internal
+// File: api/blockchain_client.go
+package api
 
 import (
 	"context"

sentinel/api/types.go

@@ -0,0 +1,22 @@
+// File: api/types.go
+package api
+
+import "github.com/ethereum/go-ethereum/common"
+
+// FilterQuery represents the parameters to filter logs/events.
+type FilterQuery struct {
+	FromBlock uint64
+	ToBlock   uint64
+	Topics    [][]common.Hash
+	Addresses []common.Address
+}
+
+// Log represents a single log event fetched from the blockchain.
+type Log struct {
+	Address     common.Address
+	Topics      []common.Hash
+	Data        []byte
+	BlockNumber uint64
+	TxHash      common.Hash
+	Index       uint
+}

sentinel/blockchain_client_wrapper/seth_wrapper.go

@@ -0,0 +1 @@
+package sentinel

sentinel/blockchain_wrapper/geth_wrapper.go

@@ -6,51 +6,56 @@ import (
 	"errors"
 
 	"github.com/rs/zerolog"
-	"github.com/smartcontractkit/chainlink-testing-framework/sentinel/internal"
+	"github.com/smartcontractkit/chainlink-testing-framework/sentinel/api"
 )
 
 // ChainPollerConfig holds the configuration for the ChainPoller.
 type ChainPollerConfig struct {
-	BlockchainClient internal.BlockchainClient
-	Logger           zerolog.Logger
+	BlockchainClient api.BlockchainClient
+	Logger           *zerolog.Logger
 	ChainID          int64
 }
 
 // ChainPoller is responsible for polling logs from the blockchain.
 type ChainPoller struct {
-	Config ChainPollerConfig
+	blockchainClient api.BlockchainClient
+	logger           zerolog.Logger
+	chainID          int64
 }
 
 // NewChainPoller initializes a new ChainPoller.
 func NewChainPoller(cfg ChainPollerConfig) (*ChainPoller, error) {
 	if cfg.BlockchainClient == nil {
 		return nil, errors.New("blockchain client cannot be nil")
 	}
-	if cfg.Logger.GetLevel() == zerolog.NoLevel {
-		return nil, errors.New("logger cannot be nil")
+	if cfg.Logger == nil {
+		return nil, errors.New("no logger passed")
+	}
+	if cfg.ChainID < 1 {
+		return nil, errors.New("chain ID not set")
 	}
 
-	cfg.Logger = cfg.Logger.With().Str("component", "ChainPoller").Logger().With().Int64("ChainID", cfg.ChainID).Logger()
+	logger := cfg.Logger.With().Str("component", "ChainPoller").Logger().With().Int64("ChainID", cfg.ChainID).Logger()
 
 	return &ChainPoller{
-		Config: cfg,
+		blockchainClient: cfg.BlockchainClient,
+		logger:           logger,
+		chainID:          cfg.ChainID,
 	}, nil
 }
 
 // Poll fetches logs from the blockchain based on the provided filter queries.
-func (cp *ChainPoller) Poll(ctx context.Context, filterQueries []internal.FilterQuery) ([]internal.Log, error) {
-	var allLogs []internal.Log
+func (cp *ChainPoller) FilterLogs(ctx context.Context, filterQueries []api.FilterQuery) ([]api.Log, error) {
+	var allLogs []api.Log
 
 	for _, query := range filterQueries {
-		logs, err := cp.Config.BlockchainClient.FilterLogs(ctx, query)
+		logs, err := cp.blockchainClient.FilterLogs(ctx, query)
 		if err != nil {
-			cp.Config.Logger.Error().Err(err).Interface("query", query).Msg("Failed to filter logs")
+			cp.logger.Error().Err(err).Interface("query", query).Msg("Failed to filter logs")
 			continue
 		}
 		allLogs = append(allLogs, logs...)
 	}
 
 	return allLogs, nil
 }
-
-var _ ChainPollerInterface = (*ChainPoller)(nil)

sentinel/chain_poller/chain_poller.go

@@ -1,13 +1,13 @@
-// File: chain_poller/interface.go
+// File: chain_poller/chain_poller_interface.go
 package chain_poller
 
 import (
 	"context"
 
-	"github.com/smartcontractkit/chainlink-testing-framework/sentinel/internal"
+	"github.com/smartcontractkit/chainlink-testing-framework/sentinel/api"
 )
 
 // ChainPollerInterface defines the methods that ChainPoller must implement.
 type ChainPollerInterface interface {
-	Poll(ctx context.Context, filterQueries []internal.FilterQuery) ([]internal.Log, error)
+	FilterLogs(ctx context.Context, filterQueries []api.FilterQuery) ([]api.Log, error)
 }