From a1fe66150971d0b596555f7a46ef897e01a681e9 Mon Sep 17 00:00:00 2001 From: Uxio Fuentefria <6909403+Uxio0@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:53:15 +0100 Subject: [PATCH] Remove deprecated clases --- gnosis/eth/django/models.py | 95 ------------------------------------- gnosis/safe/serializers.py | 14 ------ 2 files changed, 109 deletions(-) diff --git a/gnosis/eth/django/models.py b/gnosis/eth/django/models.py index 03229cb97..50c9a8f7a 100644 --- a/gnosis/eth/django/models.py +++ b/gnosis/eth/django/models.py @@ -24,44 +24,6 @@ connection = connections["default"] -class EthereumAddressField(models.CharField): - default_validators = [validate_checksumed_address] - description = "DEPRECATED. Use `EthereumAddressV2Field`. Ethereum address (EIP55)" - default_error_messages = { - "invalid": _('"%(value)s" value must be an EIP55 checksummed address.'), - } - - def __init__(self, *args, **kwargs): - kwargs["max_length"] = 42 - super().__init__(*args, **kwargs) - - def deconstruct(self): - name, path, args, kwargs = super().deconstruct() - del kwargs["max_length"] - return name, path, args, kwargs - - def from_db_value(self, value, expression, connection): - return self.to_python(value) - - def to_python(self, value): - value = super().to_python(value) - if value: - try: - return fast_to_checksum_address(value) - except ValueError: - raise exceptions.ValidationError( - self.error_messages["invalid"], - code="invalid", - params={"value": value}, - ) - else: - return value - - def get_prep_value(self, value): - value = super().get_prep_value(value) - return self.to_python(value) - - class EthereumAddressV2Field(models.Field): default_validators = [validate_checksumed_address] description = "Ethereum address (EIP55)" @@ -176,50 +138,6 @@ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) -class HexField(models.CharField): - """ - Field to store hex values (without 0x). Returns hex with 0x prefix. - - On Database side a CharField is used. - """ - - description = "Stores a hex value into a CharField. DEPRECATED, use a BinaryField" - - def from_db_value(self, value, expression, connection): - return self.to_python(value) - - def to_python(self, value): - return value if value is None else HexBytes(value).hex() - - def get_prep_value(self, value): - if value is None: - return value - elif isinstance(value, HexBytes): - return value.hex()[ - 2: - ] # HexBytes.hex() retrieves hexadecimal with '0x', remove it - elif isinstance(value, bytes): - return value.hex() # bytes.hex() retrieves hexadecimal without '0x' - else: # str - return HexBytes(value).hex()[2:] - - def formfield(self, **kwargs): - # We need max_lenght + 2 on forms because of `0x` - defaults = {"max_length": self.max_length + 2} - # TODO: Handle multiple backends with different feature flags. - if self.null and not connection.features.interprets_empty_strings_as_nulls: - defaults["empty_value"] = None - defaults.update(kwargs) - return super().formfield(**defaults) - - def clean(self, value, model_instance): - value = self.to_python(value) - self.validate(value, model_instance) - # Validation didn't work because of `0x` - self.run_validators(value[2:]) - return value - - class HexV2Field(models.BinaryField): def formfield(self, **kwargs): defaults = { @@ -229,19 +147,6 @@ def formfield(self, **kwargs): return super().formfield(**defaults) -class Sha3HashField(HexField): - description = "DEPRECATED. Use `Keccak256Field`" - - def __init__(self, *args, **kwargs): - kwargs["max_length"] = 64 - super().__init__(*args, **kwargs) - - def deconstruct(self): - name, path, args, kwargs = super().deconstruct() - del kwargs["max_length"] - return name, path, args, kwargs - - class Keccak256Field(models.BinaryField): description = "Keccak256 hash stored as binary" default_error_messages = { diff --git a/gnosis/safe/serializers.py b/gnosis/safe/serializers.py index 984ecb597..dfbb45b75 100644 --- a/gnosis/safe/serializers.py +++ b/gnosis/safe/serializers.py @@ -99,20 +99,6 @@ def validate(self, data): return data -class SafeMultisigTxSerializer(SafeMultisigEstimateTxSerializer): - """ - DEPRECATED, use `SafeMultisigTxSerializerV1` instead - """ - - safe_tx_gas = serializers.IntegerField(min_value=0) - data_gas = serializers.IntegerField(min_value=0) - gas_price = serializers.IntegerField(min_value=0) - refund_receiver = EthereumAddressField( - default=None, allow_null=True, allow_zero_address=True - ) - nonce = serializers.IntegerField(min_value=0) - - class SafeMultisigTxSerializerV1(SafeMultisigEstimateTxSerializer): """ Version 1.0.0 of the Safe changes `data_gas` to `base_gas`