imrpove RateLimiter configuration a little + fix test

vendelieu · Oct 27, 2023 · 82ce842 · 82ce842
1 parent 07619f7
commit 82ce842
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/...ram-bot/src/main/kotlin/eu/vendeli/tgbot/types/internal/configuration/BotConfiguration.kt b/...ram-bot/src/main/kotlin/eu/vendeli/tgbot/types/internal/configuration/BotConfiguration.kt
@@ -2,7 +2,6 @@ package eu.vendeli.tgbot.types.internal.configuration
 
 import eu.vendeli.tgbot.core.ClassManagerImpl
 import eu.vendeli.tgbot.core.InputListenerMapImpl
-import eu.vendeli.tgbot.core.TokenBucketLimiterImpl
 import eu.vendeli.tgbot.interfaces.ClassManager
 import eu.vendeli.tgbot.interfaces.InputListener
 
@@ -17,7 +16,7 @@ data class BotConfiguration(
     var apiHost: String = "api.telegram.org",
     var inputListener: InputListener = InputListenerMapImpl(),
     var classManager: ClassManager = ClassManagerImpl(),
-    internal var rateLimiter: RateLimiterConfiguration = RateLimiterConfiguration(TokenBucketLimiterImpl),
+    internal var rateLimiter: RateLimiterConfiguration = RateLimiterConfiguration(),
     internal var httpClient: HttpConfiguration = HttpConfiguration(),
     internal var logging: LoggingConfiguration = LoggingConfiguration(),
     internal var updatesListener: UpdatesListenerConfiguration = UpdatesListenerConfiguration(),

diff --git a/...src/main/kotlin/eu/vendeli/tgbot/types/internal/configuration/RateLimiterConfiguration.kt b/...src/main/kotlin/eu/vendeli/tgbot/types/internal/configuration/RateLimiterConfiguration.kt
@@ -2,11 +2,12 @@ package eu.vendeli.tgbot.types.internal.configuration
 
 import eu.vendeli.tgbot.TelegramBot
 import eu.vendeli.tgbot.api.message
+import eu.vendeli.tgbot.core.TokenBucketLimiterImpl
 import eu.vendeli.tgbot.interfaces.RateLimitMechanism
 
 data class RateLimiterConfiguration(
-    var mechanism: RateLimitMechanism,
     var limits: RateLimits = RateLimits(),
+    var mechanism: RateLimitMechanism = TokenBucketLimiterImpl,
 ) {
     var exceededAction: suspend (Long, TelegramBot) -> Unit = { telegramId: Long, bot: TelegramBot ->
         message("Request limit exceeded, try again later.")

diff --git a/telegram-bot/src/test/kotlin/eu/vendeli/RateLimitingTest.kt b/telegram-bot/src/test/kotlin/eu/vendeli/RateLimitingTest.kt
@@ -3,30 +3,27 @@ package eu.vendeli
 import BotTestContext
 import ch.qos.logback.classic.Level
 import eu.vendeli.tgbot.TelegramBot
-import eu.vendeli.tgbot.core.TokenBucketLimiterImpl
 import eu.vendeli.tgbot.types.internal.configuration.RateLimits
 import io.kotest.core.spec.IsolationMode
 import io.kotest.matchers.shouldBe
 import java.util.concurrent.atomic.AtomicInteger
 
 class RateLimitingTest : BotTestContext(false, true) {
     override fun isolationMode(): IsolationMode = IsolationMode.InstancePerTest
-
-    @BeforeAll
-    fun prepareBot() {
+    private fun prepareBot() {
         bot = TelegramBot("not necessary") {
             logging {
                 botLogLevel = Level.INFO
             }
             rateLimiter {
-                mechanism = TokenBucketLimiterImpl
                 limits = RateLimits(10000, 5)
             }
         }
     }
 
     @Test
     suspend fun `test limit exceeding`() {
+        prepareBot()
         val hitsCounter = AtomicInteger(0)
         val loopCounter = AtomicInteger(0)
 
@@ -44,6 +41,7 @@ class RateLimitingTest : BotTestContext(false, true) {
 
     @Test
     suspend fun `test certain command limit exceeding`() {
+        prepareBot()
         val messageHitsCounter = AtomicInteger(0)
         val commandHitsCounter = AtomicInteger(0)
         val loopsCounter = AtomicInteger(0)