diff --git a/core/chains/evm/headtracker/head_broadcaster_test.go b/core/chains/evm/headtracker/head_broadcaster_test.go
index 21c864eda69..d2dc9863268 100644
--- a/core/chains/evm/headtracker/head_broadcaster_test.go
+++ b/core/chains/evm/headtracker/head_broadcaster_test.go
@@ -12,8 +12,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
-
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
commonhtrk "github.com/smartcontractkit/chainlink/v2/common/headtracker"
commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
@@ -73,7 +72,7 @@ func TestHeadBroadcaster_Subscribe(t *testing.T) {
orm := headtracker.NewORM(db, logger, cfg.Database(), *ethClient.ConfiguredChainID())
hs := headtracker.NewHeadSaver(logger, orm, evmCfg.EVM(), evmCfg.EVM().HeadTracker())
- mailMon := mailbox.NewMonitor(t.Name())
+ mailMon := mailboxtest.NewMonitor(t)
servicetest.Run(t, mailMon)
hb := headtracker.NewHeadBroadcaster(logger)
servicetest.Run(t, hb)
diff --git a/core/chains/evm/headtracker/head_tracker_test.go b/core/chains/evm/headtracker/head_tracker_test.go
index 67e76aee52b..fd7db65ae32 100644
--- a/core/chains/evm/headtracker/head_tracker_test.go
+++ b/core/chains/evm/headtracker/head_tracker_test.go
@@ -23,6 +23,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/services"
"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -994,7 +995,7 @@ func createHeadTracker(t *testing.T, ethClient evmclient.Client, config headtrac
lggr := logger.Test(t)
hb := headtracker.NewHeadBroadcaster(lggr)
hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
- mailMon := mailbox.NewMonitor(t.Name())
+ mailMon := mailboxtest.NewMonitor(t)
return &headTrackerUniverse{
mu: new(sync.Mutex),
headTracker: headtracker.NewHeadTracker(lggr, ethClient, config, htConfig, hb, hs, mailMon),
@@ -1009,7 +1010,7 @@ func createHeadTrackerWithNeverSleeper(t *testing.T, ethClient evmclient.Client,
lggr := logger.Test(t)
hb := headtracker.NewHeadBroadcaster(lggr)
hs := headtracker.NewHeadSaver(lggr, orm, evmcfg.EVM(), evmcfg.EVM().HeadTracker())
- mailMon := mailbox.NewMonitor(t.Name())
+ mailMon := mailboxtest.NewMonitor(t)
ht := headtracker.NewHeadTracker(lggr, ethClient, evmcfg.EVM(), evmcfg.EVM().HeadTracker(), hb, hs, mailMon)
_, err := hs.Load(testutils.Context(t))
require.NoError(t, err)
@@ -1027,7 +1028,7 @@ func createHeadTrackerWithChecker(t *testing.T, ethClient evmclient.Client, conf
hb := headtracker.NewHeadBroadcaster(lggr)
hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
hb.Subscribe(checker)
- mailMon := mailbox.NewMonitor(t.Name())
+ mailMon := mailboxtest.NewMonitor(t)
ht := headtracker.NewHeadTracker(lggr, ethClient, config, htConfig, hb, hs, mailMon)
return &headTrackerUniverse{
mu: new(sync.Mutex),
diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go
index de8ff024b84..35db8f7f7bf 100644
--- a/core/chains/evm/log/helpers_test.go
+++ b/core/chains/evm/log/helpers_test.go
@@ -22,7 +22,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -90,7 +90,7 @@ func newBroadcasterHelperWithEthClient(t *testing.T, ethClient evmclient.Client,
})
config := evmtest.NewChainScopedConfig(t, globalConfig)
lggr := logger.Test(t)
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
db := pgtest.NewSqlxDB(t)
orm := log.NewORM(db, lggr, config.Database(), cltest.FixtureChainID)
diff --git a/core/chains/evm/log/integration_test.go b/core/chains/evm/log/integration_test.go
index b26e87e668c..e74d06457dd 100644
--- a/core/chains/evm/log/integration_test.go
+++ b/core/chains/evm/log/integration_test.go
@@ -18,7 +18,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -1326,7 +1326,7 @@ func TestBroadcaster_AppendLogChannel(t *testing.T) {
ch3 := make(chan types.Log)
ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
- mailMon := servicetest.RunHealthy(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.RunHealthy(t, mailboxtest.NewMonitor(t))
lb := log.NewBroadcaster(nil, ethClient, nil, logger.Test(t), nil, mailMon)
chCombined := lb.ExportedAppendLogChannel(ch1, ch2)
chCombined = lb.ExportedAppendLogChannel(chCombined, ch3)
diff --git a/core/cmd/shell.go b/core/cmd/shell.go
index 3810559cf34..e4711646cb4 100644
--- a/core/cmd/shell.go
+++ b/core/cmd/shell.go
@@ -154,7 +154,7 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
}
keyStore := keystore.New(db, utils.GetScryptParams(cfg), appLggr, cfg.Database())
- mailMon := mailbox.NewMonitor(cfg.AppID().String())
+ mailMon := mailbox.NewMonitor(cfg.AppID().String(), appLggr.Named("Mailbox"))
dbListener := cfg.Database().Listener()
eventBroadcaster := pg.NewEventBroadcaster(cfg.Database().URL(), dbListener.MinReconnectInterval(), dbListener.MaxReconnectDuration(), appLggr, cfg.AppID())
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index 8ebf4b84b46..51439ba80ec 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -341,7 +341,7 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
keyStore := keystore.NewInMemory(db, utils.FastScryptParams, lggr, cfg.Database())
- mailMon := mailbox.NewMonitor(cfg.AppID().String())
+ mailMon := mailbox.NewMonitor(cfg.AppID().String(), lggr.Named("Mailbox"))
loopRegistry := plugins.NewLoopRegistry(lggr, nil)
mercuryPool := wsrpc.NewPool(lggr, cache.Config{
diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go
index eb1a03530ae..9397db53acb 100644
--- a/core/internal/testutils/evmtest/evmtest.go
+++ b/core/internal/testutils/evmtest/evmtest.go
@@ -18,6 +18,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
"github.com/smartcontractkit/chainlink-common/pkg/types"
"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
"github.com/smartcontractkit/chainlink/v2/core/chains"
@@ -81,8 +82,9 @@ func NewChainRelayExtenders(t testing.TB, testopts TestChainOpts) *evmrelay.Chai
func NewChainRelayExtOpts(t testing.TB, testopts TestChainOpts) legacyevm.ChainRelayExtenderConfig {
require.NotNil(t, testopts.KeyStore)
+ lggr := logger.TestLogger(t)
opts := legacyevm.ChainRelayExtenderConfig{
- Logger: logger.TestLogger(t),
+ Logger: lggr,
KeyStore: testopts.KeyStore,
ChainOpts: legacyevm.ChainOpts{
AppConfig: testopts.GeneralConfig,
@@ -119,7 +121,7 @@ func NewChainRelayExtOpts(t testing.TB, testopts TestChainOpts) legacyevm.ChainR
}
}
if opts.MailMon == nil {
- opts.MailMon = servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ opts.MailMon = servicetest.Run(t, mailboxtest.NewMonitor(t))
}
if testopts.GasEstimator != nil {
opts.GenGasEstimator = func(*big.Int) gas.EvmFeeEstimator {
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index f206ddd6d5b..ba4542e74b4 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -235,7 +235,7 @@ require (
github.com/shirou/gopsutil/v3 v3.23.11 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
- github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327 // indirect
+ github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94 // indirect
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5 // indirect
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect
github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index d38fddcd922..755def9861f 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1148,8 +1148,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327 h1:7P+djpKBMQ2Cpv1ieUQdkZvDLt6owPvniHfMHSPFYjQ=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94 h1:mrxa3HrQfbMi4ji6gGcQHuLptvoNaRAv4TLnGJngbLc=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5 h1:kBnmjv3fxU7krVIqZFvo1m4F6qBc4vPURQFX/mcChhI=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5/go.mod h1:EoM7wQ81mov7wsUzG4zEnnr0EH0POEo/I0hRDg433TU=
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
diff --git a/core/services/directrequest/delegate_test.go b/core/services/directrequest/delegate_test.go
index be61cde4d60..3b80ba2f915 100644
--- a/core/services/directrequest/delegate_test.go
+++ b/core/services/directrequest/delegate_test.go
@@ -15,7 +15,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/assets"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
"github.com/smartcontractkit/chainlink/v2/core/bridges"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -45,7 +45,7 @@ func TestDelegate_ServicesForSpec(t *testing.T) {
c.EVM[0].MinIncomingConfirmations = ptr[uint32](1)
})
keyStore := cltest.NewKeyStore(t, db, cfg.Database())
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
relayerExtenders := evmtest.NewChainRelayExtenders(t, evmtest.TestChainOpts{DB: db, GeneralConfig: cfg, Client: ethClient, MailMon: mailMon, KeyStore: keyStore.Eth()})
lggr := logger.TestLogger(t)
@@ -82,7 +82,7 @@ func NewDirectRequestUniverseWithConfig(t *testing.T, cfg chainlink.GeneralConfi
runner := pipeline_mocks.NewRunner(t)
broadcaster.On("AddDependents", 1)
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
db := pgtest.NewSqlxDB(t)
keyStore := cltest.NewKeyStore(t, db, cfg.Database())
diff --git a/core/services/functions/listener_test.go b/core/services/functions/listener_test.go
index 07bd82ed288..5d26f9a4f57 100644
--- a/core/services/functions/listener_test.go
+++ b/core/services/functions/listener_test.go
@@ -20,7 +20,7 @@ import (
decryptionPlugin "github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
log_mocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -82,7 +82,7 @@ func NewFunctionsListenerUniverse(t *testing.T, timeoutSec int, pruneFrequencySe
ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
broadcaster := log_mocks.NewBroadcaster(t)
broadcaster.On("AddDependents", 1)
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
db := pgtest.NewSqlxDB(t)
kst := cltest.NewKeyStore(t, db, cfg.Database())
diff --git a/core/services/job/runner_integration_test.go b/core/services/job/runner_integration_test.go
index 14a5c41b396..27c0e0e8515 100644
--- a/core/services/job/runner_integration_test.go
+++ b/core/services/job/runner_integration_test.go
@@ -24,7 +24,7 @@ import (
"gopkg.in/guregu/null.v4"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
"github.com/smartcontractkit/chainlink/v2/core/auth"
"github.com/smartcontractkit/chainlink/v2/core/bridges"
@@ -462,7 +462,7 @@ answer1 [type=median index=0];
legacyChains,
lggr,
config.Database(),
- servicetest.Run(t, mailbox.NewMonitor(t.Name())),
+ servicetest.Run(t, mailboxtest.NewMonitor(t)),
)
_, err = sd.ServicesForSpec(jb)
require.NoError(t, err)
@@ -496,7 +496,7 @@ answer1 [type=median index=0];
legacyChains,
lggr,
config.Database(),
- servicetest.Run(t, mailbox.NewMonitor(t.Name())),
+ servicetest.Run(t, mailboxtest.NewMonitor(t)),
)
_, err = sd.ServicesForSpec(jb)
require.NoError(t, err)
@@ -524,7 +524,7 @@ answer1 [type=median index=0];
legacyChains,
lggr,
config.Database(),
- servicetest.Run(t, mailbox.NewMonitor(t.Name())),
+ servicetest.Run(t, mailboxtest.NewMonitor(t)),
)
_, err = sd.ServicesForSpec(jb)
require.NoError(t, err)
@@ -579,7 +579,7 @@ answer1 [type=median index=0];
legacyChains,
lggr,
config.Database(),
- servicetest.Run(t, mailbox.NewMonitor(t.Name())),
+ servicetest.Run(t, mailboxtest.NewMonitor(t)),
)
jb.OCROracleSpec.CaptureEATelemetry = tc.jbCaptureEATelemetry
@@ -623,7 +623,7 @@ answer1 [type=median index=0];
legacyChains,
lggr,
config.Database(),
- servicetest.Run(t, mailbox.NewMonitor(t.Name())),
+ servicetest.Run(t, mailboxtest.NewMonitor(t)),
)
services, err := sd.ServicesForSpec(*jb)
require.NoError(t, err)
diff --git a/core/services/job/spawner_test.go b/core/services/job/spawner_test.go
index b82aa73c0b5..335156a8c65 100644
--- a/core/services/job/spawner_test.go
+++ b/core/services/job/spawner_test.go
@@ -14,7 +14,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/loop"
"github.com/smartcontractkit/chainlink-common/pkg/services"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
"github.com/smartcontractkit/chainlink/v2/core/bridges"
mocklp "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
@@ -129,7 +129,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
serviceA2 := mocks.NewServiceCtx(t)
serviceA1.On("Start", mock.Anything).Return(nil).Once()
serviceA2.On("Start", mock.Anything).Return(nil).Once().Run(func(mock.Arguments) { eventuallyA.ItHappened() })
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
dA := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, make(chan struct{}), dA}
@@ -188,7 +188,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
lggr := logger.TestLogger(t)
orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
d := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, nil, d}
spawner := job.NewSpawner(orm, config.Database(), noopChecker{}, map[job.Type]job.Delegate{
@@ -222,7 +222,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
lggr := logger.TestLogger(t)
orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
d := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, nil, d}
spawner := job.NewSpawner(orm, config.Database(), noopChecker{}, map[job.Type]job.Delegate{
@@ -300,7 +300,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
jobOCR2VRF := makeOCR2VRFJobSpec(t, keyStore, config, address, chain.ID(), 2)
orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
processConfig := plugins.NewRegistrarConfig(loop.GRPCOpts{}, func(name string) (*plugins.RegisteredLoop, error) { return nil, nil })
ocr2DelegateConfig := ocr2.NewDelegateConfig(config.OCR2(), config.Mercury(), config.Threshold(), config.Insecure(), config.JobPipeline(), config.Database(), processConfig)
diff --git a/core/services/keeper/registry_synchronizer_helper_test.go b/core/services/keeper/registry_synchronizer_helper_test.go
index dff97202f6c..19ba2eedbbb 100644
--- a/core/services/keeper/registry_synchronizer_helper_test.go
+++ b/core/services/keeper/registry_synchronizer_helper_test.go
@@ -11,7 +11,7 @@ import (
"github.com/jmoiron/sqlx"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -73,7 +73,7 @@ func setupRegistrySync(t *testing.T, version keeper.RegistryVersion) (
})).Maybe().Return(func() {})
lbMock.On("IsConnected").Return(true).Maybe()
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
orm := keeper.NewORM(db, logger.TestLogger(t), ch.Config().Database())
synchronizer := keeper.NewRegistrySynchronizer(keeper.RegistrySynchronizerOptions{
diff --git a/core/services/ocr/contract_tracker_test.go b/core/services/ocr/contract_tracker_test.go
index f7ebbe08481..185a9cd3197 100644
--- a/core/services/ocr/contract_tracker_test.go
+++ b/core/services/ocr/contract_tracker_test.go
@@ -16,7 +16,7 @@ import (
ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
commonmocks "github.com/smartcontractkit/chainlink/v2/common/mocks"
evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -84,7 +84,7 @@ func newContractTrackerUni(t *testing.T, opts ...interface{}) (uni contractTrack
uni.hb = commonmocks.NewHeadBroadcaster[*evmtypes.Head, common.Hash](t)
uni.ec = evmtest.NewEthClientMock(t)
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
db := pgtest.NewSqlxDB(t)
uni.tracker = ocr.NewOCRContractTracker(
contract,
diff --git a/core/services/vrf/delegate_test.go b/core/services/vrf/delegate_test.go
index 1d9f97d136d..731437791b4 100644
--- a/core/services/vrf/delegate_test.go
+++ b/core/services/vrf/delegate_test.go
@@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
- "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+ "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
"github.com/smartcontractkit/chainlink/v2/core/bridges"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
@@ -150,7 +150,7 @@ func setup(t *testing.T) (vrfUniverse, *v1.Listener, job.Job) {
cfg := configtest.NewTestGeneralConfig(t)
vuni := buildVrfUni(t, db, cfg)
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
vd := vrf.NewDelegate(
db,
@@ -676,7 +676,7 @@ func Test_VRFV2PlusServiceFailsWhenVRFOwnerProvided(t *testing.T) {
cfg := configtest.NewTestGeneralConfig(t)
vuni := buildVrfUni(t, db, cfg)
- mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+ mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
vd := vrf.NewDelegate(
db,
diff --git a/core/web/testdata/body/health.html b/core/web/testdata/body/health.html
index 5999891a0f6..f6c1d6c80c8 100644
--- a/core/web/testdata/body/health.html
+++ b/core/web/testdata/body/health.html
@@ -73,13 +73,16 @@
JobSpawner
- Mercury
+ Mailbox
- WSRPCPool
+ Monitor
- Monitor
+ Mercury
+
+ WSRPCPool
+
PipelineORM
diff --git a/core/web/testdata/body/health.json b/core/web/testdata/body/health.json
index d8418560543..004988fceba 100644
--- a/core/web/testdata/body/health.json
+++ b/core/web/testdata/body/health.json
@@ -110,18 +110,18 @@
},
{
"type": "checks",
- "id": "Mercury.WSRPCPool",
+ "id": "Mailbox.Monitor",
"attributes": {
- "name": "Mercury.WSRPCPool",
+ "name": "Mailbox.Monitor",
"status": "passing",
"output": ""
}
},
{
"type": "checks",
- "id": "Monitor",
+ "id": "Mercury.WSRPCPool",
"attributes": {
- "name": "Monitor",
+ "name": "Mercury.WSRPCPool",
"status": "passing",
"output": ""
}
diff --git a/core/web/testdata/body/health.txt b/core/web/testdata/body/health.txt
index 5b636829587..0dfa86abad0 100644
--- a/core/web/testdata/body/health.txt
+++ b/core/web/testdata/body/health.txt
@@ -11,8 +11,8 @@
-EVM.0.Txm.Confirmer
-EVM.0.Txm.WrappedEvmEstimator
-JobSpawner
+-Mailbox.Monitor
-Mercury.WSRPCPool
--Monitor
-PipelineORM
-PipelineRunner
-PromReporter
diff --git a/go.mod b/go.mod
index 00faf4f5ee4..661addeb845 100644
--- a/go.mod
+++ b/go.mod
@@ -65,7 +65,7 @@ require (
github.com/shopspring/decimal v1.3.1
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
github.com/smartcontractkit/chainlink-automation v1.0.1
- github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327
+ github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1
github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
diff --git a/go.sum b/go.sum
index 7bfd01bfd9e..024872df5e6 100644
--- a/go.sum
+++ b/go.sum
@@ -1134,8 +1134,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327 h1:7P+djpKBMQ2Cpv1ieUQdkZvDLt6owPvniHfMHSPFYjQ=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94 h1:mrxa3HrQfbMi4ji6gGcQHuLptvoNaRAv4TLnGJngbLc=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5 h1:kBnmjv3fxU7krVIqZFvo1m4F6qBc4vPURQFX/mcChhI=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5/go.mod h1:EoM7wQ81mov7wsUzG4zEnnr0EH0POEo/I0hRDg433TU=
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 5086a1c121b..1126875b0d1 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
github.com/segmentio/ksuid v1.0.4
github.com/slack-go/slack v0.12.2
github.com/smartcontractkit/chainlink-automation v1.0.1
- github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327
+ github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94
github.com/smartcontractkit/chainlink-testing-framework v1.22.0
github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 6f539821d8e..b4e1c10229b 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1465,8 +1465,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327 h1:7P+djpKBMQ2Cpv1ieUQdkZvDLt6owPvniHfMHSPFYjQ=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218150613-43bf581ae327/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94 h1:mrxa3HrQfbMi4ji6gGcQHuLptvoNaRAv4TLnGJngbLc=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231218160643-bd451bb2dd94/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5 h1:kBnmjv3fxU7krVIqZFvo1m4F6qBc4vPURQFX/mcChhI=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231218175426-6e0427c661e5/go.mod h1:EoM7wQ81mov7wsUzG4zEnnr0EH0POEo/I0hRDg433TU=
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=