minor fixes

integration/obscurogateway/tengateway_test.go

@@ -74,7 +74,7 @@ func TestTenGateway(t *testing.T) {
 		DBType:                  "sqlite",
 		TenChainID:              443,
 		StoreIncomingTxs:        true,
-		RateLimitThreshold:      800,
+		RateLimitThreshold:      1000,
 		RateLimitDecay:          100,
 	}
 
@@ -158,11 +158,10 @@ func testRateLimiter(t *testing.T, httpURL, wsURL string, w wallet.Wallet) {
 			Data: nil,
 		}
 
-		gasLimit, err := user0.HTTPClient.EstimateGas(context.Background(), msg)
-		fmt.Println(gasLimit, err)
+		user0.HTTPClient.EstimateGas(context.Background(), msg)
 	}
 
-	// second call should fail - rate limit exceeded
+	// after 1000 requests, the rate limiter should block the user
 	_, err = user0.HTTPClient.BalanceAt(context.Background(), user0.Wallets[0].Address(), nil)
 	require.Error(t, err)
 	require.Equal(t, "rate limit exceeded", err.Error())

tools/walletextension/ratelimiter/rate_limiter.go

@@ -1,9 +1,10 @@
 package ratelimiter
 
 import (
-	"github.com/ethereum/go-ethereum/common"
 	"sync"
 	"time"
+
+	"github.com/ethereum/go-ethereum/common"
 )
 
 type Score struct {

tools/walletextension/rpcapi/utils.go

@@ -46,13 +46,12 @@ const (
 var rpcNotImplemented = fmt.Errorf("rpc endpoint not implemented")
 
 type ExecCfg struct {
-	account                 *gethcommon.Address
-	computeFromCallback     func(user *GWUser) *gethcommon.Address
-	tryAll                  bool
-	tryUntilAuthorised      bool
-	adjustArgs              func(acct *GWAccount) []any
-	cacheCfg                *CacheCfg
-	calculateRateLimitScore func() uint32
+	account             *gethcommon.Address
+	computeFromCallback func(user *GWUser) *gethcommon.Address
+	tryAll              bool
+	tryUntilAuthorised  bool
+	adjustArgs          func(acct *GWAccount) []any
+	cacheCfg            *CacheCfg
 }
 
 type CacheStrategy uint8