Fixing linter in different places

smartcontractkit · Oct 23, 2024 · 430e4f0 · 430e4f0
1 parent 810de13
commit 430e4f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/core/services/llo/onchain_channel_definition_cache.go b/core/services/llo/onchain_channel_definition_cache.go
@@ -154,7 +154,7 @@ func (c *channelDefinitionCache) Start(ctx context.Context) error {
 		} else if pd != nil {
 			c.definitions = pd.Definitions
 			c.initialBlockNum = pd.BlockNum + 1
-			c.definitionsVersion = uint32(pd.Version)
+			c.definitionsVersion = pd.Version
 		} else {
 			// ensure non-nil map ready for assignment later
 			c.definitions = make(llotypes.ChannelDefinitions)
@@ -454,6 +454,7 @@ func (c *channelDefinitionCache) persist(ctx context.Context) (memoryVersion, pe
 	return
 }
 
+// nolint:revive
 // Checks persisted version and tries to save if necessary on a periodic timer
 // Simple backup in case database persistence fails
 func (c *channelDefinitionCache) failedPersistLoop() {

diff --git a/core/services/ocr/contract_tracker.go b/core/services/ocr/contract_tracker.go
@@ -391,6 +391,7 @@ func (t *OCRContractTracker) ConfigFromLogs(ctx context.Context, changedInBlock
 	return confighelper.ContractConfigFromConfigSetEvent(*latest), err
 }
 
+// nolint:exhaustive
 // LatestBlockHeight queries the eth node for the most recent header
 func (t *OCRContractTracker) LatestBlockHeight(ctx context.Context) (blockheight uint64, err error) {
 	switch t.cfg.ChainType() {

diff --git a/core/services/ocr2/plugins/llo/integration_test.go b/core/services/ocr2/plugins/llo/integration_test.go
@@ -310,8 +310,8 @@ lloDonID = %d
 			assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
 			w.Header().Set("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			_, err := w.Write(channelDefinitionsJSON)
-			require.NoError(t, err)
+			_, err2 := w.Write(channelDefinitionsJSON)
+			require.NoError(t, err2)
 		}))
 		t.Cleanup(channelDefinitionsServer.Close)
 
@@ -397,14 +397,14 @@ channelDefinitionsContractFromBlock = %d`, serverURL, serverPubKey, donID, confi
 				t.Run(fmt.Sprintf("emulate mercury server verifying report (local verification) - node %x", req.pk), func(t *testing.T) {
 					rv := mercuryverifier.NewVerifier()
 
-					reportSigners, err := rv.Verify(mercuryverifier.SignedReport{
+					reportSigners, err2 := rv.Verify(mercuryverifier.SignedReport{
 						RawRs:         v["rawRs"].([][32]byte),
 						RawSs:         v["rawSs"].([][32]byte),
 						RawVs:         v["rawVs"].([32]byte),
 						ReportContext: v["reportContext"].([3][32]byte),
 						Report:        v["report"].([]byte),
 					}, fNodes, signerAddresses)
-					require.NoError(t, err)
+					require.NoError(t, err2)
 					assert.GreaterOrEqual(t, len(reportSigners), int(fNodes+1))
 					assert.Subset(t, signerAddresses, reportSigners)
 				})