Bugix: denoms.gwei != GWEI_PER_ETH

Define `GWEI_PER_ETH` in `eth/beacon/constants.py` and replace `denoms.gwei` with it.

Author: hwwhww

eth/beacon/constants.py

@@ -14,3 +14,4 @@
 RAND_MAX = 2 ** (RAND_BYTES * 8) - 1
 
 EMPTY_SIGNATURE = BLSSignature((0, 0))
+GWEI_PER_ETH = 10**9

eth/beacon/helpers.py

@@ -5,12 +5,12 @@
     TYPE_CHECKING,
 )
 
+import functools
+
 from eth_utils import (
-    denoms,
     to_tuple,
     ValidationError,
 )
-
 from eth_typing import (
     Hash32,
 )
@@ -23,22 +23,23 @@
 from eth._utils.numeric import (
     clamp,
 )
+from eth.beacon._utils.random import (
+    shuffle,
+    split,
+)
 
 from eth.beacon.block_committees_info import (
     BlockCommitteesInfo,
 )
+from eth.beacon.constants import (
+    GWEI_PER_ETH,
+)
 from eth.beacon.enums import (
     SignatureDomain,
 )
 from eth.beacon.types.shard_committees import (
     ShardCommittee,
 )
-from eth.beacon._utils.random import (
-    shuffle,
-    split,
-)
-import functools
-
 from eth.beacon.typing import (
     Bitfield,
     BLSPubkey,
@@ -387,7 +388,7 @@ def get_effective_balance(
     Return the effective balance (also known as "balance at stake") for a
     ``validator`` with the given ``index``.
     """
-    return min(validator_balances[index], max_deposit * denoms.gwei)
+    return min(validator_balances[index], Gwei(max_deposit * GWEI_PER_ETH))
 
 
 def get_fork_version(fork_data: 'ForkData',

tests/beacon/conftest.py

@@ -2,7 +2,6 @@
 import rlp
 
 from eth_utils import (
-    denoms,
     to_tuple,
 )
 
@@ -18,6 +17,9 @@
 from eth.beacon.aggregation import (
     aggregate_votes,
 )
+from eth.beacon.constants import (
+    GWEI_PER_ETH,
+)
 from eth.beacon.enums import (
     SignatureDomain,
 )
@@ -384,7 +386,7 @@ def ten_validators_state(empty_beacon_state, max_deposit, far_future_slot):
             for pubkey in range(validator_count)
         ),
         validator_balances=tuple(
-            max_deposit * denoms.gwei
+            max_deposit * GWEI_PER_ETH
             for _ in range(validator_count)
         )
     )
@@ -480,19 +482,21 @@ def deposit_contract_tree_depth():
 def min_deposit():
     return SERENITY_CONFIG.MIN_DEPOSIT
 
-
+@pytest.fixture
 def max_deposit():
     return SERENITY_CONFIG.MAX_DEPOSIT
 
-
+@pytest.fixture
 def genesis_fork_version():
     return SERENITY_CONFIG.GENESIS_FORK_VERSION
 
 
+@pytest.fixture
 def genesis_slot():
     return SERENITY_CONFIG.GENESIS_SLOT
 
 
+@pytest.fixture
 def far_future_slot():
     return SERENITY_CONFIG.FAR_FUTURE_SLOT
 
@@ -652,7 +656,7 @@ def activated_genesis_validators(genesis_validators, genesis_slot, entry_exit_de
 @pytest.fixture
 def genesis_balances(init_validator_pubkeys, max_deposit):
     return tuple(
-        max_deposit * denoms.gwei
+        max_deposit * GWEI_PER_ETH
         for _ in init_validator_pubkeys
     )
 

tests/beacon/state_machines/test_proposer_signature_validation.py

@@ -1,12 +1,14 @@
 import pytest
 
 from eth_utils import (
-    denoms,
     ValidationError,
 )
 
 from eth._utils import bls
 
+from eth.beacon.constants import (
+    GWEI_PER_ETH,
+)
 from eth.beacon.enums import (
     SignatureDomain,
 )
@@ -56,7 +58,7 @@ def test_validate_serenity_proposer_signature(
             for _ in range(10)
         ),
         validator_balances=tuple(
-            max_deposit * denoms.gwei
+            max_deposit * GWEI_PER_ETH
             for _ in range(10)
         ),
         shard_committees_at_slots=get_sample_shard_committees_at_slots(

tests/beacon/test_deposit_helpers.py

@@ -1,10 +1,12 @@
 import pytest
 
 from eth_utils import (
-    denoms,
     ValidationError,
 )
 
+from eth.beacon.constants import (
+    GWEI_PER_ETH,
+)
 from eth.beacon.deposit_helpers import (
     add_pending_validator,
     process_deposit,
@@ -104,6 +106,7 @@ def test_validate_proof_of_possession(sample_beacon_state_params, pubkeys, privk
 def test_process_deposit(sample_beacon_state_params,
                          privkeys,
                          pubkeys,
+                         max_deposit,
                          far_future_slot):
     state = BeaconState(**sample_beacon_state_params).copy(
         slot=1,
@@ -112,7 +115,7 @@ def test_process_deposit(sample_beacon_state_params,
 
     privkey_1 = privkeys[0]
     pubkey_1 = pubkeys[0]
-    amount = 32 * denoms.gwei
+    amount = max_deposit * GWEI_PER_ETH
     withdrawal_credentials = b'\x34' * 32
     custody_commitment = b'\x11' * 32
     randao_commitment = b'\x56' * 32

tests/beacon/test_helpers.py

@@ -9,14 +9,16 @@
 )
 
 from eth_utils import (
-    denoms,
     ValidationError,
 )
 from eth_utils.toolz import assoc
 
 from eth.constants import (
     ZERO_HASH32,
 )
+from eth.beacon.constants import (
+    GWEI_PER_ETH,
+)
 from eth.beacon.enums import (
     SignatureDomain,
 )
@@ -572,19 +574,19 @@ def mock_get_shard_committees_at_slot(state,
     ),
     [
         (
-            1 * denoms.gwei,
+            1 * GWEI_PER_ETH,
             32,
-            1 * denoms.gwei,
+            1 * GWEI_PER_ETH,
         ),
         (
-            32 * denoms.gwei,
+            32 * GWEI_PER_ETH,
             32,
-            32 * denoms.gwei,
+            32 * GWEI_PER_ETH,
         ),
         (
-            33 * denoms.gwei,
+            33 * GWEI_PER_ETH,
             32,
-            32 * denoms.gwei,
+            32 * GWEI_PER_ETH,
         )
     ]
 )

tests/beacon/types/test_states.py

@@ -2,10 +2,9 @@
 
 import rlp
 
-from eth_utils import (
-    denoms,
+from eth.beacon.constants import (
+    GWEI_PER_ETH,
 )
-
 from eth.beacon.types.states import (
     BeaconState,
 )
@@ -54,7 +53,7 @@ def test_num_validators(expected,
             for pubkey in range(expected)
         ),
         validator_balances=tuple(
-            max_deposit * denoms.gwei
+            max_deposit * GWEI_PER_ETH
             for _ in range(expected)
         )
     )