Merge pull request #1162 from ethereum/master-port

handle master-dev merge conflict
2019-06-10 12:39:47 -06:00 · 2019-06-10 12:39:47 -06:00 · 4902a7746a
parent 9df4c80b47 e68b495ada
commit 4902a7746a
1 changed files with 1 additions and 1 deletions
--- a/test_libs/pyspec/eth2spec/test/helpers/deposits.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/deposits.py
@ -77,7 +77,7 @@ def prepare_state_and_deposit(spec, state, validator_index, amount, withdrawal_c
        privkey,
        amount,
        withdrawal_credentials,
-        signed
+        signed,
    )

    state.latest_eth1_data.deposit_root = root