update tests

Author: janezpodhostnik

bootstrap/bootstrap.go

@@ -203,8 +203,6 @@ func NewEVMGatewayNodeBuilder(
 func (fnb *EVMGatewayNodeBuilder) Initialize() error {
 	fnb.PrintBuildDetails()
 
-	fnb.EnqueueMetricsServerInit()
-
 	return nil
 }
 
@@ -444,13 +442,6 @@ func (fnb *EVMGatewayNodeBuilder) ShutdownFunc(fn func() error) *EVMGatewayNodeB
 	return fnb
 }
 
-func (fnb *EVMGatewayNodeBuilder) EnqueueMetricsServerInit() {
-	fnb.Component("Metrics server", func(config config.Config) (module.ReadyDoneAware, error) {
-		server := metrics.NewServer(fnb.Logger, uint(config.MetricsPort))
-		return server, nil
-	})
-}
-
 func (fnb *EVMGatewayNodeBuilder) initMetrics() error {
 	fnb.Metrics = metrics2.NewCollector(fnb.Logger)
 	return nil

cmd/run/cmd.go

@@ -49,7 +49,7 @@ var Cmd = &cobra.Command{
 		if err != nil {
 			builder.Logger.Fatal().Err(err).Send()
 		}
-		node.Run()
+		node.Run(command.Context())
 		return nil
 	},
 }

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/onflow/atree v0.8.0
 	github.com/onflow/cadence v1.2.2
-	github.com/onflow/flow-go v0.38.0-preview.0.4.0.20241211211009-759daa544649
+	github.com/onflow/flow-go v0.38.0-preview.0.4.0.20241213150609-85fd812a7e49
 	github.com/onflow/flow-go-sdk v1.2.3
 	github.com/onflow/go-ethereum v1.14.7
 	github.com/prometheus/client_golang v1.18.0

go.sum

@@ -743,8 +743,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3
 github.com/onflow/flow-ft/lib/go/contracts v1.0.1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
 github.com/onflow/flow-ft/lib/go/templates v1.0.1 h1:FDYKAiGowABtoMNusLuRCILIZDtVqJ/5tYI4VkF5zfM=
 github.com/onflow/flow-ft/lib/go/templates v1.0.1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
-github.com/onflow/flow-go v0.38.0-preview.0.4.0.20241211211009-759daa544649 h1:9JCb0qdirFgkTOQ+iKrnX+3Q5Xh9/hFCP9yM7Ky/QKA=
-github.com/onflow/flow-go v0.38.0-preview.0.4.0.20241211211009-759daa544649/go.mod h1:c4ubAQ2WIMYY/TOaBvbajROEFWv2HwhKeGOsEdLPIM0=
+github.com/onflow/flow-go v0.38.0-preview.0.4.0.20241213150609-85fd812a7e49 h1:kcAoHB/uEGP3wTJcv2aVtCHSgwY0bdn8qjw7GvvHfM8=
+github.com/onflow/flow-go v0.38.0-preview.0.4.0.20241213150609-85fd812a7e49/go.mod h1:c4ubAQ2WIMYY/TOaBvbajROEFWv2HwhKeGOsEdLPIM0=
 github.com/onflow/flow-go-sdk v1.2.3 h1:jb+0dIXBO12Zt8x3c2xDXYPv6k3sRTUvhe59M+EcXTI=
 github.com/onflow/flow-go-sdk v1.2.3/go.mod h1:jMaffBTlAIdutx+pBhRIigLZFIBYSDDST0Uax1rW2qo=
 github.com/onflow/flow-nft/lib/go/contracts v1.2.2 h1:XFERNVUDGbZ4ViZjt7P1cGD80mO1PzUJYPfdhXFsGbQ=

services/ingestion/engine.go

@@ -135,7 +135,7 @@ func (e *Engine) run(ctx irrecoverable.SignalerContext, ready component.ReadyFun
 			err := e.processEvents(events.Events)
 			if err != nil {
 				e.log.Error().Err(err).Msg("failed to process EVM events")
-				return
+				ctx.Throw(err)
 			}
 		}
 	}