From bf3edcd09d1491e556e310d0624e83a084911565 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Fri, 3 Nov 2023 01:43:30 -0700 Subject: [PATCH] [etl_optimisations] Fix lint errors --- e2e/setup.go | 15 --------------- internal/client/client.go | 1 - internal/core/etl.go | 1 - internal/core/register.go | 1 - internal/engine/registry/balance_enforce.go | 6 ++---- internal/etl/pipeline/types.go | 2 -- internal/etl/registry/header_traversal.go | 11 ++++++----- internal/metrics/metrics.go | 4 ++-- 8 files changed, 10 insertions(+), 31 deletions(-) diff --git a/e2e/setup.go b/e2e/setup.go index 5a224e86..4bd8d5b3 100644 --- a/e2e/setup.go +++ b/e2e/setup.go @@ -50,21 +50,6 @@ type SysTestSuite struct { L2Client *ethclient.Client } -// L2TestSuite ... Stores all the information needed to run an e2e L2Geth test -type L2TestSuite struct { - t *testing.T - - L2Geth *op_e2e.OpGeth - L2Cfg *op_e2e.SystemConfig - - App *app.Application - AppCfg *config.Config - Close func() - - TestSlackSvr *TestSlackServer - TestPagerDutyServer *TestPagerDutyServer -} - // CreateSysTestSuite ... Creates a new SysTestSuite func CreateSysTestSuite(t *testing.T) *SysTestSuite { t.Log("Creating system test suite") diff --git a/internal/client/client.go b/internal/client/client.go index e118ecbb..dc843f41 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -100,7 +100,6 @@ func (b *Bundle) NodeClient(n core.Network) (ix_node.EthClient, error) { default: return nil, fmt.Errorf("invalid network supplied") } - } // FromNetwork ... Retrieves an eth client from the context diff --git a/internal/core/etl.go b/internal/core/etl.go index 32b05c02..22f1194f 100644 --- a/internal/core/etl.go +++ b/internal/core/etl.go @@ -16,7 +16,6 @@ func (ct ComponentType) String() string { case Transformer: return "transformer" - } return UnknownType diff --git a/internal/core/register.go b/internal/core/register.go index ca60b436..96232589 100644 --- a/internal/core/register.go +++ b/internal/core/register.go @@ -12,7 +12,6 @@ const ( // register enum func (rt RegisterType) String() string { switch rt { - case BlockHeader: return "block_header" diff --git a/internal/engine/registry/balance_enforce.go b/internal/engine/registry/balance_enforce.go index a03d60fc..1f748cac 100644 --- a/internal/engine/registry/balance_enforce.go +++ b/internal/engine/registry/balance_enforce.go @@ -31,9 +31,8 @@ func (bi *BalanceInvConfig) Unmarshal(isp *core.SessionParams) error { // BalanceHeuristic ... type BalanceHeuristic struct { - ctx context.Context - cfg *BalanceInvConfig - client client.EthClient + ctx context.Context + cfg *BalanceInvConfig heuristic.Heuristic } @@ -50,7 +49,6 @@ const reportMsg = ` // NewBalanceHeuristic ... Initializer func NewBalanceHeuristic(ctx context.Context, cfg *BalanceInvConfig) (heuristic.Heuristic, error) { - return &BalanceHeuristic{ ctx: ctx, cfg: cfg, diff --git a/internal/etl/pipeline/types.go b/internal/etl/pipeline/types.go index 9c4abfb1..47f4ca33 100644 --- a/internal/etl/pipeline/types.go +++ b/internal/etl/pipeline/types.go @@ -41,6 +41,4 @@ const ( emptyPipelineError = "pipeline must contain at least one component" // Manager error constants unknownCompType = "unknown component type %s provided" - - noAggregatorErr = "aggregator component has yet to be implemented" ) diff --git a/internal/etl/registry/header_traversal.go b/internal/etl/registry/header_traversal.go index 3f1321c1..757242d2 100644 --- a/internal/etl/registry/header_traversal.go +++ b/internal/etl/registry/header_traversal.go @@ -16,9 +16,8 @@ import ( ) const ( + // This could be configurable in the future batchSize = 100 - - notFoundMsg = "not found" ) type HeaderTraversal struct { @@ -61,7 +60,7 @@ func NewHeaderTraversal(ctx context.Context, cfg *core.ClientConfig, n: cfg.Network, client: node, traversal: ix_node.NewHeaderTraversal(node, startHeader, big.NewInt(0)), - pollInterval: time.Duration(cfg.PollInterval) * time.Millisecond, + pollInterval: cfg.PollInterval * time.Millisecond, } reader, err := component.NewReader(ctx, core.BlockHeader, ht, opts...) @@ -110,8 +109,10 @@ func (ht *HeaderTraversal) Loop(ctx context.Context, consumer chan core.TransitD // backfill if provided starting header if ht.traversal.LastHeader() != nil { - - ht.Backfill(ht.traversal.LastHeader().Number, recent.Number, consumer) + err = ht.Backfill(ht.traversal.LastHeader().Number, recent.Number, consumer) + if err != nil { + return err + } } else { ht.traversal = ix_node.NewHeaderTraversal(ht.client, recent, big.NewInt(0)) } diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go index 81403697..75f57b33 100644 --- a/internal/metrics/metrics.go +++ b/internal/metrics/metrics.go @@ -325,10 +325,10 @@ func (n *noopMetricer) RecordNodeError(_ core.Network) func (n *noopMetricer) RecordBlockLatency(_ core.Network, _ float64) {} func (n *noopMetricer) RecordPipelineLatency(_ core.PUUID, _ float64) {} func (n *noopMetricer) RecordAssessmentError(_ heuristic.Heuristic) {} -func (n *noopMetricer) RecordRPCClientRequest(method string) func(err error) { +func (n *noopMetricer) RecordRPCClientRequest(_ string) func(err error) { return func(err error) {} } -func (n *noopMetricer) RecordRPCClientBatchRequest(b []rpc.BatchElem) func(err error) { +func (n *noopMetricer) RecordRPCClientBatchRequest(_ []rpc.BatchElem) func(err error) { return func(err error) {} }