fix: tests

smartcontractkit · Feb 10, 2025 · 2b8f98c · 2b8f98c
1 parent 5dd51d6
commit 2b8f98c
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 4 deletions.
diff --git a/core/services/relay/evm/capabilities/workflows/syncer/workflow_syncer_test.go b/core/services/relay/evm/capabilities/workflows/syncer/workflow_syncer_test.go
@@ -33,6 +33,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/workflows"
 	"github.com/smartcontractkit/chainlink/v2/core/services/workflows/ratelimiter"
 	"github.com/smartcontractkit/chainlink/v2/core/services/workflows/syncer"
+	"github.com/smartcontractkit/chainlink/v2/core/services/workflows/syncerlimiter"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/crypto"
 
 	"github.com/stretchr/testify/require"
@@ -47,6 +48,11 @@ var rlConfig = ratelimiter.Config{
 	PerSenderBurst: 30,
 }
 
+var wlConfig = syncerlimiter.Config{
+	Global:   50,
+	PerOwner: 10,
+}
+
 type testEvtHandler struct {
 	events []syncer.Event
 	mux    sync.Mutex
@@ -354,9 +360,13 @@ func Test_SecretsWorker(t *testing.T) {
 
 	rl, err := ratelimiter.NewRateLimiter(rlConfig)
 	require.NoError(t, err)
+
+	wl, err := syncerlimiter.NewWorkflowLimits(wlConfig)
+	require.NoError(t, err)
+
 	handler := &testSecretsWorkEventHandler{
 		wrappedHandler: syncer.NewEventHandler(lggr, orm, fetcherFn, nil, nil,
-			emitter, clockwork.NewFakeClock(), workflowkey.Key{}, rl),
+			emitter, clockwork.NewFakeClock(), workflowkey.Key{}, rl, wl),
 		registeredCh: make(chan syncer.Event, 1),
 	}
 
@@ -438,8 +448,12 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyPaused(t *testing.T) {
 	er := syncer.NewEngineRegistry()
 	rl, err := ratelimiter.NewRateLimiter(rlConfig)
 	require.NoError(t, err)
+
+	wl, err := syncerlimiter.NewWorkflowLimits(wlConfig)
+	require.NoError(t, err)
+
 	handler := syncer.NewEventHandler(lggr, orm, fetcherFn, nil, nil,
-		emitter, clockwork.NewFakeClock(), workflowkey.Key{}, rl, syncer.WithEngineRegistry(er))
+		emitter, clockwork.NewFakeClock(), workflowkey.Key{}, rl, wl, syncer.WithEngineRegistry(er))
 
 	worker := syncer.NewWorkflowRegistry(
 		lggr,
@@ -538,6 +552,8 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivated(t *testing.T) {
 	er := syncer.NewEngineRegistry()
 	rl, err := ratelimiter.NewRateLimiter(rlConfig)
 	require.NoError(t, err)
+	wl, err := syncerlimiter.NewWorkflowLimits(wlConfig)
+	require.NoError(t, err)
 	handler := syncer.NewEventHandler(
 		lggr,
 		orm,
@@ -548,6 +564,7 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivated(t *testing.T) {
 		clockwork.NewFakeClock(),
 		workflowkey.Key{},
 		rl,
+		wl,
 		syncer.WithEngineRegistry(er),
 		syncer.WithEngineFactoryFn(mf.new),
 	)

diff --git a/core/services/workflows/syncerlimiter/limiter_test.go b/core/services/workflows/syncerlimiter/limiter_test.go
@@ -3,8 +3,9 @@ package syncerlimiter_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/smartcontractkit/chainlink/v2/core/services/workflows/syncerlimiter"
-	"github.com/test-go/testify/require"
 )
 
 func TestWorkflowLimits(t *testing.T) {

diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml
@@ -287,6 +287,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml
@@ -297,6 +297,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = '11155111'
 NodeAddress = '0x68902d681c28119f9b2531473a417088bf008e59'

diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -287,6 +287,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/go.mod b/go.mod
@@ -324,7 +324,6 @@ require (
 	github.com/supranational/blst v0.3.13 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
-	github.com/test-go/testify v1.1.4
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect

diff --git a/testdata/scripts/config/merge_raw_configs.txtar b/testdata/scripts/config/merge_raw_configs.txtar
@@ -433,6 +433,8 @@ ChainID = '1'
 MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
+
+[Capabilities.WorkflowRegistry.Limits]
 WorkflowsGlobalLimit = 50
 WorkflowsPerOwnerLimit = 5
 

diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar
@@ -299,6 +299,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/defaults-override.txtar b/testdata/scripts/node/validate/defaults-override.txtar
@@ -360,6 +360,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -343,6 +343,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -343,6 +343,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -343,6 +343,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/fallback-override.txtar b/testdata/scripts/node/validate/fallback-override.txtar
@@ -437,6 +437,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar
@@ -328,6 +328,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
@@ -333,6 +333,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
@@ -340,6 +340,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''

diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar
@@ -322,6 +322,10 @@ MaxBinarySize = '20.00mb'
 MaxEncryptedSecretsSize = '26.40kb'
 MaxConfigSize = '50.00kb'
 
+[Capabilities.WorkflowRegistry.Limits]
+WorkflowsGlobalLimit = 50
+WorkflowsPerOwnerLimit = 5
+
 [Capabilities.GatewayConnector]
 ChainIDForNodeKey = ''
 NodeAddress = ''