Remove InternalTxService

5afe · Feb 4, 2020 · 3778857 · 3778857
1 parent e4e4edc
commit 3778857
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 658 deletions.
diff --git a/safe_relay_service/relay/management/commands/setup_internal_txs.py b/safe_relay_service/relay/management/commands/setup_internal_txs.py
diff --git a/safe_relay_service/relay/services/__init__.py b/safe_relay_service/relay/services/__init__.py
@@ -1,7 +1,6 @@
 from .erc20_events_service import (Erc20EventsService,
                                    Erc20EventsServiceProvider)
 from .funding_service import FundingService, FundingServiceProvider
-from .internal_tx_service import InternalTxService, InternalTxServiceProvider
 from .notification_service import (NotificationService,
                                    NotificationServiceProvider)
 from .safe_creation_service import (SafeCreationService,

diff --git a/safe_relay_service/relay/services/internal_tx_service.py b/safe_relay_service/relay/services/internal_tx_service.py
diff --git a/safe_relay_service/relay/services/stats_service.py b/safe_relay_service/relay/services/stats_service.py
@@ -85,10 +85,6 @@ def add_time_filter(queryset):
                 'average_deploy_time_total_seconds':
                     SafeContract.objects.get_average_deploy_time_total_grouped(from_date, to_date),
                 'payment_tokens': SafeContract.objects.get_creation_tokens_usage_grouped(from_date, to_date),
-                'funds_stored': {
-                    'ether': SafeContract.objects.get_total_balance_grouped(from_date, to_date),
-                    'tokens': SafeContract.objects.get_total_token_balance_grouped(from_date, to_date),
-                }
             },
             'relayed_txs': {
                 'total': add_time_filter(SafeMultisigTx.objects.annotate(
@@ -97,10 +93,6 @@ def add_time_filter(queryset):
                 'average_execution_time_seconds': SafeMultisigTx.objects.get_average_execution_time_grouped(from_date,
                                                                                                             to_date),
                 'payment_tokens': add_time_filter(SafeMultisigTx.objects.get_tokens_usage_grouped()),
-                'volume': {
-                    'ether': SafeContract.objects.get_total_volume_grouped(from_date, to_date),
-                    'tokens': SafeContract.objects.get_total_token_volume_grouped(from_date, to_date),
-                }
             }
         }
 
@@ -122,19 +114,11 @@ def add_time_filter(queryset):
                 'average_deploy_time_total_seconds':
                     SafeContract.objects.get_average_deploy_time_total(from_date, to_date),
                 'payment_tokens': SafeContract.objects.get_creation_tokens_usage(from_date, to_date),
-                'funds_stored': {
-                    'ether': SafeContract.objects.get_total_balance(from_date, to_date),  #FIXME
-                    'tokens': SafeContract.objects.get_total_token_balance(from_date, to_date),  #FIXME
-                }
             },
             'relayed_txs': {
                 'total': add_time_filter(SafeMultisigTx.objects.all()).count(),
                 'average_execution_time_seconds': SafeMultisigTx.objects.get_average_execution_time(from_date, to_date),
                 'pending_txs': add_time_filter(SafeMultisigTx.objects.pending()).count(),
                 'payment_tokens': add_time_filter(SafeMultisigTx.objects.get_tokens_usage()),
-                'volume': {
-                    'ether': SafeContract.objects.get_total_volume(from_date, to_date),
-                    'tokens': SafeContract.objects.get_total_token_volume(from_date, to_date),
-                }
             }
         }
diff --git a/safe_relay_service/relay/tasks.py b/safe_relay_service/relay/tasks.py
@@ -17,7 +17,7 @@
 
 from .repositories.redis_repository import RedisRepository
 from .services import (Erc20EventsServiceProvider, FundingServiceProvider,
-                       InternalTxServiceProvider, NotificationServiceProvider,
+                       NotificationServiceProvider,
                        SafeCreationServiceProvider, TransactionServiceProvider)
 from .services.safe_creation_service import NotEnoughFundingForCreation
 
@@ -339,23 +339,6 @@ def check_balance_of_accounts_task() -> bool:
     return result
 
 
-@app.shared_task(soft_time_limit=60 * 30)
-def find_internal_txs_task() -> int:
-    """
-    Find and process internal txs for existing safes
-    :return: Number of safes processed
-    """
-    number_safes = 0
-    try:
-        redis = RedisRepository().redis
-        with redis.lock('tasks:find_internal_txs_task', blocking_timeout=1, timeout=60 * 30):
-            number_safes = InternalTxServiceProvider().process_all()
-            logger.info('Find internal txs task processed %d safes', number_safes)
-    except LockError:
-        pass
-    return number_safes
-
-
 @app.shared_task(soft_time_limit=60 * 30)
 def find_erc_20_721_transfers_task() -> int:
     """

diff --git a/safe_relay_service/relay/tests/test_commands.py b/safe_relay_service/relay/tests/test_commands.py
@@ -37,17 +37,6 @@ def test_send_slack_notification(self):
         self.assertIn('Slack not configured, ignoring', text)
         self.assertIn('Starting Safe Relay version', text)
 
-    def test_setup_internal_txs(self):
-        buf = StringIO()
-
-        safe = SafeContractFactory()
-        call_command('setup_internal_txs', stdout=buf)
-        self.assertIn('Generated 0 SafeTxStatus', buf.getvalue())
-
-        SafeCreation2Factory(safe=safe, block_number=10)
-        call_command('setup_internal_txs', stdout=buf)
-        self.assertIn('Generated 1 SafeTxStatus', buf.getvalue())
-
     def test_setup_service(self):
         from ..management.commands.setup_service import Command
         number_tasks = len(Command.tasks)