refactor: claen up code

Author: andraz maier

fdc/models.py

@@ -77,8 +77,8 @@ def response(self):
         abi = json.loads(self.abi)
         a = {"inputs": [abi], "type": "function"}
         c = decode_transaction_data(
-            a, EMPTY_METHOD_IDENTIFIER + self.response_hex, [abi_bytes_to_hex]
-        )  # type: ignore
+            a, EMPTY_METHOD_IDENTIFIER + self.response_hex, [abi_bytes_to_hex] # type: ignore
+        ) 
 
         return c["data"]
 

fdc/serializers/v1/query.py

@@ -5,7 +5,5 @@
 
 class ListAttestationResultV1QuerySerializer(serializers.Serializer):
     voting_round_id = serializers.IntegerField(
-        required=False,
-        default=config.epoch.voting_epoch_factory.now_id,
-        help_text="Voting round. Defaults to latest.",
+        help_text="Voting round.",
     )

ftso/models.py

@@ -38,14 +38,6 @@ def __str__(self):
     def representation(self) -> str:
         return bytes.fromhex(self.feed_id[2:]).decode().rstrip("\x00").strip()
 
-    @property
-    def type(self) -> int:
-        return int(self.feed_id[:2], 16)
-
-    @property
-    def timestamp(self):
-        return config.epoch.voting_epoch(self.voting_round_id).next.start_s
-
     @property
     def hash(self):
         name_mapper = {

ftso/serializers/data.py

@@ -7,7 +7,7 @@
 class Prefix0xField(serializers.CharField):
     def to_representation(self, value):
         if value is None:
-            return None
+            return "None"
 
         return prefix_0x(value)
 
@@ -30,7 +30,6 @@ class FeedValueStructSerializer(serializers.ModelSerializer):
     id = Prefix0xField(source="feed_id")
     value = serializers.IntegerField()
     turnoutBIPS = serializers.IntegerField(source="turnout_bips")
-    decimals = serializers.IntegerField()
 
     class Meta:
         model = FeedResult

ftso/serializers/query.py

@@ -7,14 +7,6 @@ class FeedResultAvailableFeedsQuerySerializer(serializers.Serializer):
         help_text="Voting round. Defaults to latest.",
     )
 
-
-class FeedResultFeedWithProofQuerySerializer(serializers.Serializer):
-    voting_round_id = serializers.IntegerField(
-        required=False,
-        help_text="Voting round. Defaults to latest.",
-    )
-
-
 class FeedResultFeedsWithProofsQuerySerializer(serializers.Serializer):
     voting_round_id = serializers.IntegerField(
         required=False,

ftso/tests/test_base_model.py

@@ -36,14 +36,6 @@ def test_feed_result_representation_2(self):
         feed_result = FeedResult.objects.get(pk=2)
         self.assertEqual(feed_result.representation, "AAVE/USD")
 
-    def test_feed_result_type(self):
-        feed_result = FeedResult.objects.get(pk=1)
-        self.assertEqual(feed_result.type, 1)
-
-    def test_feed_result_timestamp(self):
-        feed_result = FeedResult.objects.get(pk=1)
-        self.assertEqual(feed_result.timestamp, 1658430135)
-
     def test_feed_result_hash_1(self):
         feed_result = FeedResult.objects.get(pk=1)
         self.assertEqual(

ftso/views.py

@@ -96,8 +96,8 @@ def anchor_feeds_with_proof(self, request, *args, **kwargs):
             self.get_queryset()
             .filter(voting_round_id=voting_round_id)
             .filter(feed_id__in=feed_ids)
-            .all()
         )
+        # TODO: (Andraz) For consistency, consider returning an empty list instead of an error.
         if queryset is None:
             return response.Response(
                 data={"error": "anchor feeds not found"},

processing/main.py

@@ -119,7 +119,7 @@ def run(self, protocol_config: ProtocolProcessingConfig):
 
                 if time.time() - processing_retry.time <= 20:
                     # the first event has the smallest t in the processing_queue
-                    retry_queue.appendleft(ProcessingRetry(event, retry, time.time()))
+                    retry_queue.appendleft(processing_retry)
                     break
 
                 try:

processing/utils.py

@@ -1,45 +1,12 @@
-import re
-
-from web3 import Web3
-
-
 def prefix_0x(to_prefix: str) -> str:
     if len(to_prefix) >= 2:
         if to_prefix[:2] == "0x":
             return to_prefix
     return f"0x{to_prefix}"
 
 
-def is_debug_file(filename: str) -> bool:
-    pattern = re.compile(r"^(.*\.dbg\.json$).*$")
-    found = pattern.match(filename)
-    return found is not None
-
-
-def is_method_id(maybe_method_id: str) -> bool:
-    pattern = re.compile(r"^((0x)?[a-fA-F0-9]{8})$")
-    found = pattern.match(maybe_method_id)
-    return found is not None
-
-
-def to_method_id(method_signature: str) -> str:
-    return Web3.keccak(text=method_signature).hex()[2:10]
-
-
-def extract_method_id_from_input(input: str) -> str:
-    unprefixed = un_prefix_0x(input)
-    if len(unprefixed) >= 8:
-        return unprefixed[:8]
-    return ""
-
-
 def un_prefix_0x(to_unprefixed: str) -> str:
     if len(to_unprefixed) >= 2:
         if to_unprefixed[:2] == "0x":
             return to_unprefixed[2:]
     return to_unprefixed
-
-
-def event_signature(event_abi: dict) -> str:
-    params = ",".join([a["type"] for a in event_abi["inputs"]])
-    return un_prefix_0x(Web3.keccak(text=event_abi["name"] + "(" + params + ")").hex())