From d30150febc9500a04fb69c7fcc6b7f72b6caf58b Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Sat, 13 Feb 2021 04:28:36 -0800
Subject: [PATCH] Fix config name for max squeaks per address per block (#835)

---
 itests/config.ini                      | 2 +-
 squeaknode/config/config.py            | 6 +++---
 squeaknode/node/squeak_node.py         | 2 +-
 squeaknode/node/squeak_rate_limiter.py | 8 ++++----
 tests/core/test_squeak_controller.py   | 5 -----
 tests/core/test_squeak_core.py         | 5 -----
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/itests/config.ini b/itests/config.ini
index 5a09e4cf..ea7bd157 100644
--- a/itests/config.ini
+++ b/itests/config.ini
@@ -1,7 +1,7 @@
 [core]
 network=simnet
 price_msat=1000000
-max_squeaks_per_address_per_hour=5
+max_squeaks_per_address_per_block=5
 
 [lnd]
 host=lnd
diff --git a/squeaknode/config/config.py b/squeaknode/config/config.py
index e53c66f5..48fc67fd 100644
--- a/squeaknode/config/config.py
+++ b/squeaknode/config/config.py
@@ -15,7 +15,7 @@ logger = logging.getLogger(__name__)
 DEFAULT_NETWORK = "testnet"
 DEFAULT_PRICE_MSAT = 10000
 DEFAULT_LOG_LEVEL = "INFO"
-DEFAULT_MAX_SQUEAKS_PER_ADDRESS_PER_HOUR = 100
+DEFAULT_MAX_SQUEAKS_PER_ADDRESS_PER_BLOCK = 100
 DEFAULT_SERVER_RPC_HOST = "0.0.0.0"
 DEFAULT_SERVER_RPC_PORT = 8774
 DEFAULT_ADMIN_RPC_HOST = "0.0.0.0"
@@ -91,8 +91,8 @@ class CoreConfig(Config):
     default_peer_rpc_port = key(
         cast=int, required=False, default=DEFAULT_SERVER_RPC_PORT)
     price_msat = key(cast=int, required=False, default=DEFAULT_PRICE_MSAT)
-    max_squeaks_per_address_per_hour = key(
-        cast=int, required=False, default=DEFAULT_MAX_SQUEAKS_PER_ADDRESS_PER_HOUR)
+    max_squeaks_per_address_per_block = key(
+        cast=int, required=False, default=DEFAULT_MAX_SQUEAKS_PER_ADDRESS_PER_BLOCK)
     sqk_dir_path = key(cast=str, required=False, default=DEFAULT_SQK_DIR_PATH)
     log_level = key(cast=str, required=False, default=DEFAULT_LOG_LEVEL)
 
diff --git a/squeaknode/node/squeak_node.py b/squeaknode/node/squeak_node.py
index 4a7a7b01..ef8ceb89 100644
--- a/squeaknode/node/squeak_node.py
+++ b/squeaknode/node/squeak_node.py
@@ -58,7 +58,7 @@ class SqueakNode:
         )
         squeak_rate_limiter = SqueakRateLimiter(
             squeak_db,
-            self.config.core.max_squeaks_per_address_per_hour,
+            self.config.core.max_squeaks_per_address_per_block,
         )
         payment_processor = PaymentProcessor(
             squeak_db,
diff --git a/squeaknode/node/squeak_rate_limiter.py b/squeaknode/node/squeak_rate_limiter.py
index 98645992..5ac73ed2 100644
--- a/squeaknode/node/squeak_rate_limiter.py
+++ b/squeaknode/node/squeak_rate_limiter.py
@@ -12,10 +12,10 @@ class SqueakRateLimiter:
     def __init__(
         self,
         squeak_db,
-        max_squeaks_per_address_per_hour,
+        max_squeaks_per_address_per_block,
     ):
         self.squeak_db = squeak_db
-        self.max_squeaks_per_address_per_hour = max_squeaks_per_address_per_hour
+        self.max_squeaks_per_address_per_block = max_squeaks_per_address_per_block
 
     def should_rate_limit_allow(self, squeak):
         logger.info("Checking rate limit for squeak: {!r}".format(
@@ -25,10 +25,10 @@ class SqueakRateLimiter:
             squeak)
         logger.info(
             "Current squeak count: {}, limit: {}".format(
-                current_squeak_count, self.max_squeaks_per_address_per_hour
+                current_squeak_count, self.max_squeaks_per_address_per_block
             )
         )
-        return current_squeak_count < self.max_squeaks_per_address_per_hour
+        return current_squeak_count < self.max_squeaks_per_address_per_block
 
     def _get_num_squeaks_with_address_with_block(self, squeak):
         address = str(squeak.GetAddress())
diff --git a/tests/core/test_squeak_controller.py b/tests/core/test_squeak_controller.py
index 2927461b..56f0490c 100644
--- a/tests/core/test_squeak_controller.py
+++ b/tests/core/test_squeak_controller.py
@@ -48,11 +48,6 @@ def price_msat():
     return 777
 
 
-@pytest.fixture
-def max_squeaks_per_address_per_hour():
-    return 5000
-
-
 @pytest.fixture
 def squeak_rate_limiter():
     return mock.Mock(spec=SqueakRateLimiter)
diff --git a/tests/core/test_squeak_core.py b/tests/core/test_squeak_core.py
index 87cdd1a8..a4586b50 100644
--- a/tests/core/test_squeak_core.py
+++ b/tests/core/test_squeak_core.py
@@ -26,11 +26,6 @@ def price_msat():
     return 777
 
 
-@pytest.fixture
-def max_squeaks_per_address_per_hour():
-    return 5000
-
-
 class MockBitcoinClient(BitcoinClient):
     genesis_block_info = BlockInfo(
         block_height=0,