From 88ecf43d323dea06d8963440008face5d56a0d28 Mon Sep 17 00:00:00 2001 From: Michael Neuder Date: Mon, 20 Mar 2023 15:57:33 -0600 Subject: [PATCH] context fix --- services/api/optimistic_test.go | 2 +- services/api/service.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/api/optimistic_test.go b/services/api/optimistic_test.go index 89c81430..86d07d85 100644 --- a/services/api/optimistic_test.go +++ b/services/api/optimistic_test.go @@ -306,7 +306,7 @@ func TestProcessOptimisticBlock(t *testing.T) { backend.relay.blockSimRateLimiter = &MockBlockSimulationRateLimiter{ simulationError: tc.simulationError, } - backend.relay.processOptimisticBlock(context.Background(), blockSimOptions{ + backend.relay.processOptimisticBlock(blockSimOptions{ isHighPrio: true, log: backend.relay.log, builder: &blockBuilderCacheEntry{ diff --git a/services/api/service.go b/services/api/service.go index 43aebac7..e60e88fa 100644 --- a/services/api/service.go +++ b/services/api/service.go @@ -529,12 +529,13 @@ func (api *RelayAPI) demoteBuilder(pubkey string, req *common.BuilderSubmitBlock // processOptimisticBlock is called on a new goroutine when a optimistic block // needs to be simulated. -func (api *RelayAPI) processOptimisticBlock(ctx context.Context, opts blockSimOptions) { +func (api *RelayAPI) processOptimisticBlock(opts blockSimOptions) { api.optimisticBlocksInFlight += 1 defer func() { api.optimisticBlocksInFlight -= 1 }() api.optimisticBlocks.Add(1) defer api.optimisticBlocks.Done() + ctx := context.Background() builderPubkey := opts.req.BuilderPubkey().String() opts.log.WithFields(logrus.Fields{ "builderPubkey": builderPubkey, @@ -1477,7 +1478,7 @@ func (api *RelayAPI) handleSubmitNewBlock(w http.ResponseWriter, req *http.Reque builderEntry.status.IsOptimistic && payload.Slot() == api.optimisticSlot { optimisticSubmission = true - go api.processOptimisticBlock(req.Context(), opts) + go api.processOptimisticBlock(opts) } else { // Simulate block (synchronously). simErr = api.simulateBlock(req.Context(), opts)