diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e93b16a69..5f95f47ce 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,15 +2,15 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/PyCQA/isort - rev: 5.9.3 + rev: 5.10.1 hooks: - id: isort - repo: https://github.com/psf/black - rev: 21.9b0 + rev: 22.1.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 3.9.2 + rev: 4.0.1 hooks: - id: flake8 - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/gnosis/eth/django/tests/test_models.py b/gnosis/eth/django/tests/test_models.py index 4fc68ced8..7f3a676fb 100644 --- a/gnosis/eth/django/tests/test_models.py +++ b/gnosis/eth/django/tests/test_models.py @@ -51,8 +51,8 @@ def test_uint256_field(self): for value in [ 2, -2, - 2 ** 256, - 2 ** 260, + 2**256, + 2**260, 25572735541615049941137326092682691158109824779649981270427004917341670006487, None, ]: @@ -62,7 +62,7 @@ def test_uint256_field(self): # Overflow with self.assertRaises(Exception): - value = 2 ** 263 + value = 2**263 Uint256.objects.create(value=value) def test_sha3_hash_field(self): diff --git a/gnosis/eth/oracles/oracles.py b/gnosis/eth/oracles/oracles.py index d648e9e31..2d5c06e28 100644 --- a/gnosis/eth/oracles/oracles.py +++ b/gnosis/eth/oracles/oracles.py @@ -127,7 +127,7 @@ def get_price( try: # Get decimals for token, estimation will be more accurate decimals = self.ethereum_client.erc20.get_decimals(token_address_1) - token_unit = int(10 ** decimals) + token_unit = int(10**decimals) ( expected_rate, _, @@ -446,13 +446,13 @@ def get_price( reserves_2, reserves_1 = reserves_1, reserves_2 # Check liquidity. Require at least 2 units of every token to be on the pool - if reserves_1 / 10 ** decimals_1 < 2 or reserves_2 / 10 ** decimals_2 < 2: + if reserves_1 / 10**decimals_1 < 2 or reserves_2 / 10**decimals_2 < 2: raise CannotGetPriceFromOracle( f"Not enough liquidity for pair token_1={token_address} " f"token_2={token_address_2}" ) - decimals_normalized_reserves_1 = reserves_1 * 10 ** decimals_2 - decimals_normalized_reserves_2 = reserves_2 * 10 ** decimals_1 + decimals_normalized_reserves_1 = reserves_1 * 10**decimals_2 + decimals_normalized_reserves_2 = reserves_2 * 10**decimals_1 return decimals_normalized_reserves_2 / decimals_normalized_reserves_1 except ( @@ -517,7 +517,7 @@ def get_pool_token_price(self, pool_token_address: ChecksumAddress) -> float: ): try: price = self.get_price(token_address) - total_value = (reserves / 10 ** decimals_1) * price + total_value = (reserves / 10**decimals_1) * price return (total_value * 2) / (total_supply / 1e18) except CannotGetPriceFromOracle: continue @@ -822,7 +822,7 @@ def get_pool_token_price(self, pool_token_address: ChecksumAddress) -> float: for token_balance, token_decimal, token_price in zip( token_balances, token_decimals, token_prices ): - total_eth_value += (token_balance / 10 ** token_decimal) * token_price + total_eth_value += (token_balance / 10**token_decimal) * token_price return total_eth_value / (total_supply / 1e18) except (ValueError, BadFunctionCallOutput, DecodingError): raise CannotGetPriceFromOracle( @@ -868,7 +868,7 @@ def get_pool_token_price(self, pool_token_address: ChecksumAddress) -> float: token_contract.functions.decimals(), ] ) - total_value = (token_balance / 10 ** token_decimals) * price + total_value = (token_balance / 10**token_decimals) * price return (total_value * 2) / (total_supply / 1e18) except CannotGetPriceFromOracle: continue