Merge pull request #1620 from ChihChengLiang/rename-DepositParameters-to-DepositInput

Fix #1619, Rename DepositParameters to DepositInput

Author: hwwhww

eth/beacon/types/deposit_data.py

@@ -1,29 +1,28 @@
 
 import rlp
 from eth.rlp.sedes import uint64
-from .deposit_parameters import DepositParameters
+from .deposit_input import DepositInput
 
 
 class DepositData(rlp.Serializable):
     """
     Not in spec, this is for fields in Deposit
     """
     fields = [
-        # Deposit parameters
-        ('deposit_parameters', DepositParameters),
+        ('deposit_input', DepositInput),
         # Value in Gwei
         ('value', uint64),
         # Timestamp from deposit contract
         ('timestamp', uint64),
     ]
 
     def __init__(self,
-                 deposit_parameters: DepositParameters,
+                 deposit_input: DepositInput,
                  value: int,
                  timestamp: int) -> None:
 
         super().__init__(
-            deposit_parameters,
+            deposit_input,
             value,
             timestamp,
         )

eth/beacon/types/deposit_parameters.py renamed to eth/beacon/types/deposit_input.py

@@ -16,7 +16,7 @@
 )
 
 
-class DepositParameters(rlp.Serializable):
+class DepositInput(rlp.Serializable):
     """
     Note: using RLP until we have standardized serialization format.
     """

tests/beacon/conftest.py

@@ -21,7 +21,7 @@
 )
 
 from eth.beacon.types.deposits import DepositData
-from eth.beacon.types.deposit_parameters import DepositParameters
+from eth.beacon.types.deposit_input import DepositInput
 
 from eth.beacon.types.blocks import (
     BeaconBlockBody,
@@ -169,29 +169,30 @@ def sample_crosslink_record_params():
 
 
 @pytest.fixture
-def sample_deposit_parameters_params():
+def sample_deposit_input_params():
     return {
-        # BLS pubkey
         'pubkey': 123,
-        # BLS proof of possession (a BLS signature)
         'proof_of_possession': (0, 0),
-        # Withdrawal credentials
         'withdrawal_credentials': b'\11' * 32,
-        # Initial RANDAO commitment
         'randao_commitment': b'\11' * 32,
     }
 
 
 @pytest.fixture
-def sample_deposit_params(sample_deposit_parameters_params):
+def sample_deposit_data_params(sample_deposit_input_params):
+    return {
+        'deposit_input': DepositInput(**sample_deposit_input_params),
+        'value': 56,
+        'timestamp': 1501851927,
+    }
+
+
+@pytest.fixture
+def sample_deposit_params(sample_deposit_data_params):
     return {
         'merkle_branch': (),
         'merkle_tree_index': 5,
-        'deposit_data': DepositData(
-            deposit_parameters=DepositParameters(**sample_deposit_parameters_params),
-            value=56,
-            timestamp=1501851927,
-        )
+        'deposit_data': DepositData(**sample_deposit_data_params)
     }
 
 

tests/beacon/types/test_deposit_data.py

@@ -0,0 +1,9 @@
+from eth.beacon.types.deposit_data import DepositData
+
+
+def test_defaults(sample_deposit_data_params):
+    deposit_data = DepositData(**sample_deposit_data_params)
+
+    assert deposit_data.deposit_input.pubkey == sample_deposit_data_params['deposit_input'].pubkey
+    assert deposit_data.value == sample_deposit_data_params['value']
+    assert deposit_data.timestamp == sample_deposit_data_params['timestamp']

tests/beacon/types/test_deposit_input.py

@@ -0,0 +1,7 @@
+from eth.beacon.types.deposit_input import DepositInput
+
+
+def test_defaults(sample_deposit_input_params):
+    deposit_input = DepositInput(**sample_deposit_input_params)
+
+    assert deposit_input.pubkey == sample_deposit_input_params['pubkey']