From 9bb0f25f18198a5e02b3290f5d5eee025d8c68a1 Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 10 Jun 2019 13:41:28 +0100 Subject: [PATCH 1/2] Update specs/core/0_beacon-chain.md Co-Authored-By: NIC Lin --- specs/core/0_beacon-chain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md index 8cacde746..543f20d59 100644 --- a/specs/core/0_beacon-chain.md +++ b/specs/core/0_beacon-chain.md @@ -1166,7 +1166,7 @@ Whenever the deposit contract emits a `Deposit` log call the function `is_genesi When `is_genesis_trigger(deposits, timestamp) is True` for the first time let: * `genesis_deposits = deposits` -* `genesis_time = timestamp % SECONDS_PER_DAY + 2 * SECONDS_PER_DAY` where `SECONDS_PER_DAY = 86400` +* `genesis_time = timestamp - timestamp % SECONDS_PER_DAY + 2 * SECONDS_PER_DAY` where `SECONDS_PER_DAY = 86400` * `genesis_eth1_data` be the object of type `Eth1Data` where: * `genesis_eth1_data.block_hash` is the block hash for the last deposit in `deposits` * `genesis_eth1_data.deposit_root` is the deposit root for the last deposit in `deposits` From 4d6a25f16101782ff41ac4dbf62c8c321e5d8dbe Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 10 Jun 2019 13:43:00 +0100 Subject: [PATCH 2/2] Update conftest.py --- deposit_contract/tests/contracts/conftest.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/deposit_contract/tests/contracts/conftest.py b/deposit_contract/tests/contracts/conftest.py index b8b488abe..d4c7da9aa 100644 --- a/deposit_contract/tests/contracts/conftest.py +++ b/deposit_contract/tests/contracts/conftest.py @@ -62,26 +62,6 @@ def registration_contract(w3, tester): return registration_deployed -@pytest.fixture(params=[0, 1, 2]) -def modified_registration_contract( - request, - w3, - tester): - registration_code = get_deposit_contract_code() - contract_bytecode = compiler.compile_code(registration_code)['bytecode'] - contract_abi = compiler.mk_full_signature(registration_code) - registration = w3.eth.contract( - abi=contract_abi, - bytecode=contract_bytecode) - tx_hash = registration.constructor().transact() - tx_receipt = w3.eth.waitForTransactionReceipt(tx_hash) - registration_deployed = w3.eth.contract( - address=tx_receipt.contractAddress, - abi=contract_abi - ) - return registration_deployed - - @pytest.fixture def assert_tx_failed(tester): def assert_tx_failed(function_to_test, exception=eth_tester.exceptions.TransactionFailed):