Fix rebase

smartcontractkit · Aug 21, 2024 · 4330772 · 4330772
1 parent 4c7622d
commit 4330772
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/services/llo/onchain_channel_definition_cache.go b/core/services/llo/onchain_channel_definition_cache.go
@@ -308,10 +308,10 @@ func (c *channelDefinitionCache) fetchLoop(closeCh chan struct{}, log *channel_c
 
 	err := c.fetchAndSetChannelDefinitions(ctx, log)
 	if err == nil {
-		c.lggr.Debugw("Set new channel definitions", "version", log.Version, "url", log.Url, "sha", fmt.Sprintf("%x", log.Sha))
+		c.lggr.Debugw("Set new channel definitions", "donID", c.donID, "version", log.Version, "url", log.Url, "sha", fmt.Sprintf("%x", log.Sha))
 		return
 	}
-	c.lggr.Warnw("Error while fetching channel definitions", "version", log.Version, "url", log.Url, "sha", fmt.Sprintf("%x", log.Sha), "err", err, "attempt", attemptCnt)
+	c.lggr.Warnw("Error while fetching channel definitions", "donID", c.donID, "version", log.Version, "url", log.Url, "sha", fmt.Sprintf("%x", log.Sha), "err", err, "attempt", attemptCnt)
 
 	for {
 		select {
@@ -324,7 +324,7 @@ func (c *channelDefinitionCache) fetchLoop(closeCh chan struct{}, log *channel_c
 				c.lggr.Warnw("Error while fetching channel definitions", "version", log.Version, "url", log.Url, "sha", fmt.Sprintf("%x", log.Sha), "err", err, "attempt", attemptCnt)
 				continue
 			}
-			c.lggr.Debugw("Set new channel definitions", "version", log.Version, "url", log.Url, "sha", fmt.Sprintf("%x", log.Sha))
+			c.lggr.Debugw("Set new channel definitions", "donID", c.donID, "version", log.Version, "url", log.Url, "sha", fmt.Sprintf("%x", log.Sha))
 			return
 		}
 	}

diff --git a/core/services/llo/onchain_channel_definition_cache_test.go b/core/services/llo/onchain_channel_definition_cache_test.go
@@ -16,12 +16,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	llotypes "github.com/smartcontractkit/chainlink-common/pkg/types/llo"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/llo-feeds/generated/channel_config_store"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type mockLogPoller struct {
@@ -116,7 +116,7 @@ func Test_ChannelDefinitionCache(t *testing.T) {
 	t.Run("readLogs", func(t *testing.T) {
 		lp := &mockLogPoller{latestBlockErr: sql.ErrNoRows}
 		newLogCh := make(chan *channel_config_store.ChannelConfigStoreNewChannelDefinition, 100)
-		cdc := &channelDefinitionCache{donID: donID, lp: lp, lggr: logger.TestLogger(t), newLogCh: newLogCh}
+		cdc := &channelDefinitionCache{donID: donID, lp: lp, lggr: logger.TestSugared(t), newLogCh: newLogCh}
 
 		t.Run("skips if logpoller has no blocks", func(t *testing.T) {
 			err := cdc.readLogs()
@@ -271,7 +271,7 @@ func Test_ChannelDefinitionCache(t *testing.T) {
 	t.Run("fetchChannelDefinitions", func(t *testing.T) {
 		c := &mockHTTPClient{}
 		cdc := &channelDefinitionCache{
-			lggr:      logger.TestLogger(t),
+			lggr:      logger.TestSugared(t),
 			client:    c,
 			httpLimit: 2048,
 		}
@@ -369,7 +369,7 @@ func Test_ChannelDefinitionCache(t *testing.T) {
 
 	t.Run("persist", func(t *testing.T) {
 		cdc := &channelDefinitionCache{
-			lggr:  logger.TestLogger(t),
+			lggr:  logger.TestSugared(t),
 			orm:   nil,
 			addr:  testutils.NewAddress(),
 			donID: donID,