GlcoinCore/squeaknode
1
0
Fork 0
mirror of https://github.com/yzernik/squeaknode.git synced 2026-08-13 12:33:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix config name for max squeaks per address per block (#835)

Browse source
This commit is contained in:
Jonathan Zernik 2021-02-13 04:28:36 -08:00 • committed by GitHub
parent 791b76bd1b
commit d30150febc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
itests/config.ini
View file

@ -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

6
squeaknode/config/config.py
View file

@ -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)

2
squeaknode/node/squeak_node.py
View file

@ -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,

8
squeaknode/node/squeak_rate_limiter.py
View file

@ -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())

5
tests/core/test_squeak_controller.py
View file

@ -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)

5
tests/core/test_squeak_core.py
View file

@ -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,