pkg/settings/cresettings: HTTPAction s/RateLimit/CallLimit

Author: jmank88

pkg/settings/cresettings/defaults.json

@@ -49,14 +49,13 @@
 			"FilterTopicsPerSlotLimit": "10"
 		},
 		"HTTPAction": {
-			"RateLimit": "every30s:3",
+			"CallLimit": "3",
 			"ResponseSizeLimit": "10kb",
 			"ConnectionTimeout": "10s",
 			"RequestSizeLimit": "100kb",
 			"CacheAgeLimit": "10m0s"
 		},
 		"ChainWrite": {
-			"RateLimit": "every30s:3",
 			"TargetsLimit": "3",
 			"ReportSizeLimit": "1kb",
 			"EVM": {

pkg/settings/cresettings/defaults.toml

@@ -50,14 +50,13 @@ FilterAddressLimit = '5'
 FilterTopicsPerSlotLimit = '10'
 
 [PerWorkflow.HTTPAction]
-RateLimit = 'every30s:3'
+CallLimit = '3'
 ResponseSizeLimit = '10kb'
 ConnectionTimeout = '10s'
 RequestSizeLimit = '100kb'
 CacheAgeLimit = '10m0s'
 
 [PerWorkflow.ChainWrite]
-RateLimit = 'every30s:3'
 TargetsLimit = '3'
 ReportSizeLimit = '1kb'
 

pkg/settings/cresettings/settings.go

@@ -82,14 +82,13 @@ var Default = Schema{
 			EventSizeLimit:           Size(5 * config.KByte),
 		},
 		HTTPAction: httpAction{
-			RateLimit:         Rate(rate.Every(30*time.Second), 3),
+			CallLimit:         Int(3),
 			ResponseSizeLimit: Size(10 * config.KByte),
 			ConnectionTimeout: Duration(10 * time.Second),
 			RequestSizeLimit:  Size(100 * config.KByte),
 			CacheAgeLimit:     Duration(10 * time.Minute),
 		},
 		ChainWrite: chainWrite{
-			RateLimit:       Rate(rate.Every(30*time.Second), 3),
 			TargetsLimit:    Int(3),
 			ReportSizeLimit: Size(config.KByte),
 			EVM: evmChainWrite{
@@ -177,14 +176,13 @@ type logTrigger struct {
 	FilterTopicsPerSlotLimit Setting[int] `unit:"{topic}"`
 }
 type httpAction struct {
-	RateLimit         Setting[config.Rate]
+	CallLimit         Setting[int] `unit:"{call}"`
 	ResponseSizeLimit Setting[config.Size]
 	ConnectionTimeout Setting[time.Duration]
 	RequestSizeLimit  Setting[config.Size]
 	CacheAgeLimit     Setting[time.Duration]
 }
 type chainWrite struct {
-	RateLimit       Setting[config.Rate]
 	TargetsLimit    Setting[int] `unit:"{target}"`
 	ReportSizeLimit Setting[config.Size]
 

pkg/settings/cresettings/settings_test.go

@@ -83,7 +83,7 @@ func TestSchema_Unmarshal(t *testing.T) {
 			"EventRateLimit": "every13s:6"
 		},
 		"HTTPAction": {
-			"RateLimit": "every3s:5",
+			"CallLimit": "5",
 			"CacheAgeLimit": "5m"
 		},
 		"ChainWrite": {
@@ -107,7 +107,7 @@ func TestSchema_Unmarshal(t *testing.T) {
 	assert.Equal(t, config.Rate{Limit: rate.Every(10 * time.Second), Burst: 5}, cfg.PerWorkflow.CRONTrigger.RateLimit.DefaultValue)
 	assert.Equal(t, config.Rate{Limit: rate.Every(30 * time.Second), Burst: 3}, cfg.PerWorkflow.HTTPTrigger.RateLimit.DefaultValue)
 	assert.Equal(t, config.Rate{Limit: rate.Every(13 * time.Second), Burst: 6}, cfg.PerWorkflow.LogTrigger.EventRateLimit.DefaultValue)
-	assert.Equal(t, config.Rate{Limit: rate.Every(3 * time.Second), Burst: 5}, cfg.PerWorkflow.HTTPAction.RateLimit.DefaultValue)
+	assert.Equal(t, 5, cfg.PerWorkflow.HTTPAction.CallLimit.DefaultValue)
 	assert.Equal(t, 5*time.Minute, cfg.PerWorkflow.HTTPAction.CacheAgeLimit.DefaultValue)
 	assert.Equal(t, uint64(500000), cfg.PerWorkflow.ChainWrite.EVM.TransactionGasLimit.DefaultValue)
 	assert.Equal(t, 3, cfg.PerWorkflow.ChainRead.CallLimit.DefaultValue)