diff --git a/companion/pools/__init__.py b/companion/pools/__init__.py index 6523eda..ddff2ee 100644 --- a/companion/pools/__init__.py +++ b/companion/pools/__init__.py @@ -30,22 +30,20 @@ class Handler: return miner.raw_balance def _watch_miner_payments(self, miner, last_transaction=None): - if miner.last_transaction and miner.last_transaction.txid != last_transaction: - logger.debug('watching miner payments') - # send notifications for recent payements only - for transaction in miner.transactions[MAX_NOTIFICATIONS_COUNT:]: - if not last_transaction or transaction.txid > last_transaction: - logger.info(f'new payment {transaction.txid}') - if self.notifier: - logger.debug('sending payment notification') - arguments = {'pool': self.pool_name, 'address': miner.address, 'txid': transaction.txid, - 'amount': transaction.amount, 'amount_fiat': transaction.amount_fiat, - 'time': transaction.time, 'duration': transaction.duration} - try: - self.notifier.notify_payment(**arguments) - logger.info('payment notification sent') - except Exception as err: - logger.error('failed to send notification') - logger.exception(err) + logger.debug('watching miner payments') + if miner.last_transaction and (not last_transaction or miner.last_transaction.txid != last_transaction): + # send notifications for last payment only + logger.info(f'new payment {miner.last_transaction.txid}') + if self.notifier: + logger.debug('sending payment notification') + arguments = {'pool': self.pool_name, 'address': miner.address, 'txid': miner.last_transaction.txid, + 'amount': miner.last_transaction.amount, 'amount_fiat': miner.last_transaction.amount_fiat, + 'time': miner.last_transaction.time, 'duration': miner.last_transaction.duration} + try: + self.notifier.notify_payment(**arguments) + logger.info('payment notification sent') + except Exception as err: + logger.error('failed to send notification') + logger.exception(err) if miner.last_transaction and miner.last_transaction.txid: return miner.last_transaction.txid diff --git a/companion/pools/flexpool.py b/companion/pools/flexpool.py index 9f2f50c..ea94de3 100644 --- a/companion/pools/flexpool.py +++ b/companion/pools/flexpool.py @@ -40,6 +40,7 @@ class Miner: miner = flexpoolapi.miner(address) self.raw_balance = miner.balance() self.balance = convert_weis(self.raw_balance) + self.balance_fiat = None if exchange_rate and currency: self.balance_fiat = convert_fiat(amount=self.raw_balance, exchange_rate=exchange_rate, currency=currency) payout_threshold = self.get_payout_threshold(miner) diff --git a/requirements/tests.txt b/requirements/tests.txt index e972258..89b1fa6 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,2 +1,3 @@ pytest==6.2.2 pytest-cov==2.11.1 +pytest-mock==3.5.1 diff --git a/tests/test_flexpool.py b/tests/test_flexpool.py new file mode 100644 index 0000000..a214f68 --- /dev/null +++ b/tests/test_flexpool.py @@ -0,0 +1,120 @@ +from companion.pools.flexpool import FlexpoolHandler, Miner, Transaction +from datetime import datetime, timedelta +import pytest + +class TestFlexpoolHandler: + # def test_block(self, mocker): + def test_init(self): + handler = FlexpoolHandler() + assert handler.pool_name == 'flexpool' + + def test_new_balance_with_notification(self, mocker): + """Old balance is 1, new balance is 2, should send notification""" + notifier = mocker.Mock() + notifier.notify_balance = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + miner = mocker.patch('flexpoolapi.miner') + miner().balance.return_value = 2 + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_payments') + mocker.patch('companion.pools.flexpool.Miner.get_payements') + last_balance, last_transaction = handler.watch_miner(address='addr', last_balance=1) + assert last_balance == 2 + notifier.notify_balance.assert_called_once() + + def test_new_balance_after_payment_with_notification(self, mocker): + """Old balance is 0, new balance is 1 (old > new), should send notification""" + notifier = mocker.Mock() + notifier.notify_balance = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + miner = mocker.patch('flexpoolapi.miner') + miner().balance.return_value = 0 + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_payments') + mocker.patch('companion.pools.flexpool.Miner.get_payements') + last_balance, last_transaction = handler.watch_miner(address='addr', last_balance=1) + assert last_balance == 0 + notifier.notify_balance.assert_called_once() + + def test_very_new_balance_with_notification(self, mocker): + """Old balance doesn't exist, new balance is 1, should send notification""" + notifier = mocker.Mock() + notifier.notify_balance = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + miner = mocker.patch('flexpoolapi.miner') + miner().balance.return_value = 1 + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_payments') + mocker.patch('companion.pools.flexpool.Miner.get_payements') + last_balance, last_transaction = handler.watch_miner(address='addr') + assert last_balance == 1 + notifier.notify_balance.assert_called_once() + + def test_same_balance_without_notification(self, mocker): + """Old balance and new balance are the same, should not send notification""" + notifier = mocker.Mock() + notifier.notify_balance = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + miner = mocker.patch('flexpoolapi.miner') + miner().balance.return_value = 1 + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_payments') + mocker.patch('companion.pools.flexpool.Miner.get_payements') + last_balance, last_transaction = handler.watch_miner(address='addr', last_balance=1) + assert last_balance == 1 + notifier.notify_balance.assert_not_called() + + def test_new_payment_with_notification(self, mocker): + """One transaction saved (trx1), two transactions detected (trx1, trx2), should send notification""" + notifier = mocker.Mock() + notifier.notify_payment = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + mocker.patch('flexpoolapi.miner') + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_balance') + get_payements = mocker.patch('companion.pools.flexpool.Miner.get_payements') + get_payements.return_value = [ + Transaction(txid='trx1', amount=1, time=datetime.now(), duration=timedelta(minutes=1)), + Transaction(txid='trx2', amount=1, time=datetime.now(), duration=timedelta(minutes=1)) + ] + last_balance, last_transaction = handler.watch_miner(address='addr', last_transaction='trx1') + assert last_transaction == 'trx2' + notifier.notify_payment.assert_called_once() + + def test_very_new_payment_with_notification(self, mocker): + """No transaction saved, one transaction detected (trx1), should send notification""" + notifier = mocker.Mock() + notifier.notify_payment = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + mocker.patch('flexpoolapi.miner') + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_balance') + get_payements = mocker.patch('companion.pools.flexpool.Miner.get_payements') + get_payements.return_value = [ + Transaction(txid='trx1', amount=1, time=datetime.now(), duration=timedelta(minutes=1)) + ] + last_balance, last_transaction = handler.watch_miner(address='addr', last_transaction=None) + assert last_transaction == 'trx1' + notifier.notify_payment.assert_called_once() + + def test_same_payment_without_notification(self, mocker): + """One transaction saved (trx1), one transaction detected (trx1), should not send notification""" + notifier = mocker.Mock() + notifier.notify_payment = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + mocker.patch('flexpoolapi.miner') + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_balance') + get_payements = mocker.patch('companion.pools.flexpool.Miner.get_payements') + get_payements.return_value = [ + Transaction(txid='trx1', amount=1, time=datetime.now(), duration=timedelta(minutes=1)) + ] + last_balance, last_transaction = handler.watch_miner(address='addr', last_transaction='trx1') + assert last_transaction == 'trx1' + notifier.notify_payment.assert_not_called() + + def test_zero_payment_without_notification(self, mocker): + """Zero transaction saved, zero transaction detected, should not send notification""" + notifier = mocker.Mock() + notifier.notify_payment = mocker.Mock() + handler = FlexpoolHandler(notifier=notifier) + mocker.patch('flexpoolapi.miner') + mocker.patch('companion.pools.flexpool.FlexpoolHandler._watch_miner_balance') + get_payements = mocker.patch('companion.pools.flexpool.Miner.get_payements') + get_payements.return_value = [] + last_balance, last_transaction = handler.watch_miner(address='addr', last_transaction=None) + assert last_transaction is None + notifier.notify_payment.assert_not_called()