status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

re-add test_interop to all_tests and mark several v0.10.1 phase 0 spec references as v0.11.1

This commit is contained in:
Dustin Brody 2020-04-06 20:55:47 +02:00 committed by zah
parent e7de8aae20
commit 2771deadfc
7 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AllTests-mainnet.md
View File

@ -51,6 +51,13 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
+ Attestation topics OK + Attestation topics OK
``` ```
OK: 1/1 Fail: 0/1 Skip: 0/1 OK: 1/1 Fail: 0/1 Skip: 0/1
## Interop
```diff
+ Interop genesis OK
+ Interop signatures OK
+ Mocked start private key OK
```
OK: 3/3 Fail: 0/3 Skip: 0/3
## Official - 0.11.1 - constants & config [Preset: mainnet] ## Official - 0.11.1 - constants & config [Preset: mainnet]
```diff ```diff
+ BASE_REWARD_FACTOR 64 [Preset: mainnet] OK + BASE_REWARD_FACTOR 64 [Preset: mainnet] OK
@ -222,4 +229,4 @@ OK: 4/4 Fail: 0/4 Skip: 0/4
OK: 8/8 Fail: 0/8 Skip: 0/8 OK: 8/8 Fail: 0/8 Skip: 0/8
---TOTAL--- ---TOTAL---
OK: 141/144 Fail: 3/144 Skip: 0/144 OK: 144/147 Fail: 3/147 Skip: 0/147

9
AllTests-minimal.md
View File

@ -78,6 +78,13 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
+ Attestation topics OK + Attestation topics OK
``` ```
OK: 1/1 Fail: 0/1 Skip: 0/1 OK: 1/1 Fail: 0/1 Skip: 0/1
## Interop
```diff
+ Interop genesis OK
+ Interop signatures OK
+ Mocked start private key OK
```
OK: 3/3 Fail: 0/3 Skip: 0/3
## Official - 0.11.1 - constants & config [Preset: minimal] ## Official - 0.11.1 - constants & config [Preset: minimal]
```diff ```diff
+ BASE_REWARD_FACTOR 64 [Preset: minimal] OK + BASE_REWARD_FACTOR 64 [Preset: minimal] OK
@ -249,4 +256,4 @@ OK: 4/4 Fail: 0/4 Skip: 0/4
OK: 8/8 Fail: 0/8 Skip: 0/8 OK: 8/8 Fail: 0/8 Skip: 0/8
---TOTAL--- ---TOTAL---
OK: 156/159 Fail: 3/159 Skip: 0/159 OK: 159/162 Fail: 3/162 Skip: 0/162

2
beacon_chain/block_pool.nim
View File

@ -943,7 +943,7 @@ proc getProposer*(pool: BlockPool, head: BlockRef, slot: Slot): Option[Validator
pool.withState(pool.tmpState, head.atSlot(slot)): pool.withState(pool.tmpState, head.atSlot(slot)):
var cache = get_empty_per_epoch_cache() var cache = get_empty_per_epoch_cache()
# https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/specs/phase0/validator.md#validator-assignments # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/validator.md#validator-assignments
let proposerIdx = get_beacon_proposer_index(state, cache) let proposerIdx = get_beacon_proposer_index(state, cache)
if proposerIdx.isNone: if proposerIdx.isNone:
warn "Missing proposer index", warn "Missing proposer index",

2
beacon_chain/spec/beaconstate.nim
View File

@ -193,7 +193,7 @@ proc slash_validator*(state: var BeaconState, slashed_index: ValidatorIndex,
increase_balance( increase_balance(
state, whistleblower_index, whistleblowing_reward - proposer_reward) state, whistleblower_index, whistleblowing_reward - proposer_reward)
# https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/specs/phase0/beacon-chain.md#genesis # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/beacon-chain.md#genesis
proc initialize_beacon_state_from_eth1*( proc initialize_beacon_state_from_eth1*(
eth1_block_hash: Eth2Digest, eth1_block_hash: Eth2Digest,
eth1_timestamp: uint64, eth1_timestamp: uint64,

4
beacon_chain/spec/presets/mainnet.nim
View File

@ -20,7 +20,7 @@ type
const const
# Misc # Misc
# --------------------------------------------------------------- # ---------------------------------------------------------------
# https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/configs/mainnet.yaml#L6 # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/configs/mainnet.yaml#L6
MAX_COMMITTEES_PER_SLOT* {.intdefine.} = 64 MAX_COMMITTEES_PER_SLOT* {.intdefine.} = 64
@ -49,7 +49,7 @@ const
HYSTERESIS_UPWARD_MULTIPLIER* = 5 HYSTERESIS_UPWARD_MULTIPLIER* = 5
# Constants (TODO: not actually configurable) # Constants (TODO: not actually configurable)
# https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/specs/phase0/beacon-chain.md#constants # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/beacon-chain.md#constants
BASE_REWARDS_PER_EPOCH* = 4 BASE_REWARDS_PER_EPOCH* = 4
DEPOSIT_CONTRACT_TREE_DEPTH* = 32 DEPOSIT_CONTRACT_TREE_DEPTH* = 32

2
beacon_chain/spec/presets/minimal.nim
View File

@ -20,7 +20,7 @@ type
const const
# Misc # Misc
# --------------------------------------------------------------- # ---------------------------------------------------------------
# https://github.com/ethereum/eth2.0-specs/blob/v0.10.1/configs/minimal.yaml#L4 # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/configs/minimal.yaml#L4
# Changed # Changed
MAX_COMMITTEES_PER_SLOT* = 4 MAX_COMMITTEES_PER_SLOT* = 4

8
tests/all_tests.nim
View File

@ -27,12 +27,8 @@ import # Unit test
./test_zero_signature, ./test_zero_signature,
./test_peer_pool, ./test_peer_pool,
./test_sync_manager, ./test_sync_manager,
./test_honest_validator ./test_honest_validator,
./test_interop
# ./test_interop
# TODO: BLS changes in v0.10.1 will generate different interop signatures
# Requires an update of the interop mocked start: https://github.com/ethereum/eth2.0-pm/tree/master/interop/mocked_start
# or of ZRNT / ZCLI to v0.10.1
import # Refactor state transition unit tests import # Refactor state transition unit tests
# TODO re-enable when useful # TODO re-enable when useful