context cleanup (#13047)

smartcontractkit · Apr 30, 2024 · 61106ec · 61106ec
1 parent 5b87de0
commit 61106ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/common/client/poller.go b/common/client/poller.go
@@ -78,8 +78,7 @@ func (p *Poller[T]) pollingLoop() {
 			return
 		case <-ticker.C:
 			// Set polling timeout
-			pollingCtx, cancelPolling := context.WithTimeout(context.Background(), p.pollingTimeout)
-			p.stopCh.CtxCancel(pollingCtx, cancelPolling)
+			pollingCtx, cancelPolling := p.stopCh.CtxCancel(context.WithTimeout(context.Background(), p.pollingTimeout))
 			// Execute polling function
 			result, err := p.pollingFunc(pollingCtx)
 			cancelPolling()

diff --git a/core/internal/testutils/pgtest/txdb.go b/core/internal/testutils/pgtest/txdb.go
@@ -19,7 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/store/dialects"
 )
 
-// TODO still need to import this for side effects
 // txdb is a simplified version of https://github.com/DATA-DOG/go-txdb
 //
 // The original lib has various problems and is hard to understand because it