github/consensus-specs
1
1
Fork 0
mirror of https://github.com/ethereum/consensus-specs.git synced 2026-02-02 09:35:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1162 from ethereum/master-port

Browse Source 
handle master-dev merge conflict
This commit is contained in:
Danny Ryan
2019-06-10 12:39:47 -06:00
committed by GitHub
parent 9df4c80b47 e68b495ada
commit 4902a7746a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test_libs/pyspec/eth2spec/test/helpers/deposits.py
View File

@@ -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