RateLimit credits only for Quota

0xsequence · Jul 10, 2024 · 497c31e · 497c31e
1 parent 9bad32c
commit 497c31e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/middleware/common.go b/middleware/common.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/0xsequence/quotacontrol/proto"
-	"github.com/go-chi/httprate"
 )
 
 const (
@@ -205,7 +204,6 @@ func getProjectID(ctx context.Context) (uint64, bool) {
 
 // WithComputeUnits sets the compute units and rate limit increment to the context.
 func WithComputeUnits(ctx context.Context, cu int64) context.Context {
-	ctx = httprate.WithIncrement(ctx, int(cu))
 	return context.WithValue(ctx, ctxKeyComputeUnits, cu)
 }
 

diff --git a/middleware/middleware_ratelimit.go b/middleware/middleware_ratelimit.go
@@ -71,6 +71,9 @@ func RateLimit(rlCfg RLConfig, redisCfg redis.Config) func(next http.Handler) ht
 			if _, ok := GetService(ctx); ok {
 				ctx = httprate.WithRequestLimit(ctx, serviceRPM)
 			} else if q, ok := GetAccessQuota(ctx); ok {
+				if cu, ok := getComputeUnits(ctx); ok {
+					ctx = httprate.WithIncrement(ctx, int(cu))
+				}
 				ctx = httprate.WithRequestLimit(ctx, int(q.Limit.RateLimit))
 			} else if _, ok := GetAccount(ctx); ok {
 				ctx = httprate.WithRequestLimit(ctx, accountRPM)