[v1.5.0] Use renamed method select_safe_encoded_message_hash_by_safe_version

Author: akshay-ap

safe_transaction_service/history/serializers.py

@@ -34,7 +34,9 @@
     TxDecoderException,
     get_db_tx_decoder,
 )
-from safe_transaction_service.safe_messages.utils import select_hash_by_safe_version
+from safe_transaction_service.safe_messages.utils import (
+    select_safe_encoded_message_hash_by_safe_version,
+)
 from safe_transaction_service.tokens.serializers import TokenInfoResponseSerializer
 from safe_transaction_service.utils.serializers import (
     EpochDateTimeField,
@@ -120,7 +122,7 @@ def validate_signature(self, signature: bytes):
         )
 
         safe_owners = get_safe_owners(safe_address)
-        safe_hash_preimage = select_hash_by_safe_version(
+        safe_hash_preimage = select_safe_encoded_message_hash_by_safe_version(
             safe.get_version(), safe_tx.safe_tx_hash, safe_tx.safe_tx_hash_preimage
         )
         parsed_signatures = SafeSignature.parse_signature(
@@ -271,7 +273,7 @@ def validate(self, attrs):
         # TODO Make signature mandatory
         signature = attrs.get("signature", b"")
         # For v1.5.0+, the isValidSignature(bytes32,bytes) expects the original message_hash (bytes32),
-        safe_signature_hash = select_hash_by_safe_version(
+        safe_signature_hash = select_safe_encoded_message_hash_by_safe_version(
             safe.get_version(), safe_tx.safe_tx_hash, safe_tx.safe_tx_hash_preimage
         )
         parsed_signatures = SafeSignature.parse_signature(

safe_transaction_service/history/tests/test_views.py

@@ -31,7 +31,9 @@
 from safe_transaction_service.contracts.models import ContractQuerySet
 from safe_transaction_service.contracts.tests.factories import ContractFactory
 from safe_transaction_service.contracts.tx_decoder import DbTxDecoder
-from safe_transaction_service.safe_messages.utils import select_hash_by_safe_version
+from safe_transaction_service.safe_messages.utils import (
+    select_safe_encoded_message_hash_by_safe_version,
+)
 from safe_transaction_service.tokens.models import Token
 from safe_transaction_service.tokens.tests.factories import TokenFactory
 from safe_transaction_service.utils.utils import datetime_to_str
@@ -1772,7 +1774,7 @@ def test_post_multisig_transaction_with_1271_signature(self):
         safe_tx_hash = safe_tx.safe_tx_hash
         safe_tx_hash_preimage = safe_tx.safe_tx_hash_preimage
 
-        selected_hash = select_hash_by_safe_version(
+        selected_hash = select_safe_encoded_message_hash_by_safe_version(
             safe.get_version(), safe_tx_hash, safe_tx_hash_preimage
         )
 

safe_transaction_service/safe_messages/serializers.py

@@ -24,7 +24,7 @@
 from .utils import (
     get_message_encoded,
     get_safe_message_hash_and_preimage_for_message,
-    select_hash_by_safe_version,
+    select_safe_encoded_message_hash_by_safe_version,
 )
 
 
@@ -137,7 +137,7 @@ def validate(self, attrs):
         # not the Safe-encoded hash
         ethereum_client = get_auto_ethereum_client()
         safe = Safe(safe_address, ethereum_client)
-        safe_message_preimage = select_hash_by_safe_version(
+        safe_message_preimage = select_safe_encoded_message_hash_by_safe_version(
             safe.get_version(), safe_message_hash, safe_message_preimage
         )
         safe_signatures = SafeSignature.parse_signature(
@@ -186,7 +186,7 @@ def validate(self, attrs):
         assert to_0x_hex_str(safe_message_hash) == safe_message.message_hash
 
         safe = Safe(safe_address, get_auto_ethereum_client())
-        safe_message_preimage = select_hash_by_safe_version(
+        safe_message_preimage = select_safe_encoded_message_hash_by_safe_version(
             safe.get_version(), safe_message_hash, safe_message_preimage
         )
         safe_signatures = SafeSignature.parse_signature(

safe_transaction_service/safe_messages/tests/test_views.py

@@ -31,7 +31,7 @@
 from ..utils import (
     encode_eip191_message,
     encode_eip712_message,
-    select_hash_by_safe_version,
+    select_safe_encoded_message_hash_by_safe_version,
 )
 from .mocks import get_eip712_payload_mock
 
@@ -299,7 +299,7 @@ def _test_safe_messages_create_using_1271_signature_view(self, safe_deployment_f
             fast_keccak(message_encoded)
         )
 
-        data = select_hash_by_safe_version(
+        data = select_safe_encoded_message_hash_by_safe_version(
             safe.get_version(), safe_message_hash, safe_message_preimage
         )