This repository has been archived by the owner on Jul 1, 2021. It is now read-only.
Gather validator with beacon node plugin #594
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Sorry, I forgot there are still todos undone and added reviewers. Please ignore this PR for now and review it later after the todos are solved. |
mhchia
force-pushed
the
feature/validator-in-beacon-node-plugin
branch
from
99b3ba7
to
f294f76
Compare
| num_validators = 5 | ||
| cmd_gen_testnet_files = f"trinity-beacon testnet --num={num_validators} --network-dir={dir_root}" | ||
| cmd_alice = f"trinity-beacon --port={port_alice} --trinity-root-dir={dir_alice} --beacon-nodekey=6b94ffa2d9b8ee85afb9d7153c463ea22789d3bbc5d961cc4f63a41676883c19 -l debug" # noqa: E501 | ||
| cmd_bob = f"trinity-beacon --port={port_bob} --trinity-root-dir={dir_bob} --beacon-nodekey=f5ad1c57b5a489fc8f21ad0e5a19c1f1a60b8ab357a2100ff7e75f3fa8a4fd2e --bootstrap_nodes=enode://c289557985d885a3f13830a475d649df434099066fbdc840aafac23144f6ecb70d7cc16c186467f273ad7b29707aa15e6a50ec3fde35ae2e69b07b3ddc7a36c7@127.0.0.1:{port_alice} -l debug" # noqa: E501 |
There was a problem hiding this comment.
These nodekeys and enode address can be extracted as new variables
| f"rm -rf {dir_root}" | ||
| ) | ||
| await proc.wait() | ||
| # proc = await run( |
| await asyncio.sleep(time_bob_wait_for_alice) | ||
|
|
||
| node_bob = Node('Bob\t0e01b', cmd_bob) | ||
| # node_bob.add_event("stderr", START_SYNCING) |
mhchia
force-pushed
the
feature/validator-in-beacon-node-plugin
branch
2 times, most recently
from
9a74dbc
to
831e761
Compare
mhchia
changed the title
|
@ChihChengLiang @NIC619 This should be ready for the review:) |
mhchia
force-pushed
the
feature/validator-in-beacon-node-plugin
branch
from
c647f63
to
bb1b295
Compare
ChihChengLiang
approved these changes
May 15, 2019
NIC619
reviewed
May 15, 2019
| @@ -239,23 +251,29 @@ def _get_slot_with_validator_selected(largest_index, start_slot, state, state_ma | |||
|
|
|||
|
|
|||
| @pytest.mark.asyncio | |||
| async def test_validator_new_slot(caplog, event_loop, event_bus, monkeypatch): | |||
| caplog.set_level(logging.DEBUG) | |||
| async def test_validator_propose_or_skip_block_propose(event_loop, event_bus, monkeypatch): | |||
There was a problem hiding this comment.
Can we merge this and test_validator_propose_or_skip_block_skip into one test? The names are quite confusing and the codes are mostly the same.
|
|
||
| def extract_genesis_state_from_stream(stream: Union[Path, "StreamTextType"]) -> BeaconState: | ||
| yaml = YAML(typ="unsafe") | ||
| genesis_json = yaml.load(stream) |
There was a problem hiding this comment.
Do we need to check if the genesis file is indeed there? Or the from_formatted_dict will raise error if it's empty?
There was a problem hiding this comment.
yaml.load raises ruamel.yaml.scanner.ScannerError if the content is malformed. IMO it's fine to let the exception raise here.
|
|
||
| slot_ticker = SlotTicker( | ||
| genesis_slot=state_machine.config.GENESIS_SLOT, | ||
| genesis_time=state.genesis_time, |
There was a problem hiding this comment.
Seems weird to access GENESIS_TIME from state(though it IS part of the state). IMO it's more proper to get this from a chain_config or chain. cc @hwwhww @ChihChengLiang
There was a problem hiding this comment.
I added a field genesis_time in genesis_data, whereas it is still initialized from state.genesis_time.
NIC619
approved these changes
May 15, 2019
Fix the test for `_try_import_orphan_blocks` TODO: add tests for the rest of new methods Add tests For `_process_received_block`, `_broadcast_block`, and `import_block`. Add comments to BCCReceiveServer Add more comments and modify some. Add beacon plugin and SyncBlockImporter from ethereum#465 Move files from ethereum#465 Add utils to work with testnet And modify original code to accommodate with the new desing Minor fix Modify `BeaconChainSyncer` Plugin works with `run_beacon_nodes.py` now! Clean up for linters
- Fix `test_validator.py` - Remove `test_beacon_node_syncing.py` - Add a test for `propose_or_skip_block` - Remove left-over merge directives
- Reduce hardcoded values - Move globals to locals or static class var - Remove useless comment and print
- Add running nodes to `Node.running_nodes` - Rename `NopBlockImporter` to `NoopBlockImporter` - Add `genesis_time` in `BeaconGenesisData` - Merge tests of `propose_or_skip_block` - Sort import statements - Add FIXME for using `state_machine_class.config` - Remove unneeded `loop.run_forever()` - Add `PrivateKeyNotFound` when parsing validator's private keys - Rename `_extract_privkey_from_stream` to `_read_privkey`
mhchia
force-pushed
the
feature/validator-in-beacon-node-plugin
branch
from
771abc3
to
af9cf66
Compare
7 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What was wrong?
Merge the rest of #465 back.
How was it fixed?
Based on #587.
Validator,SlotTickerin beacon node plugin based on the genesis files and privkeys.run_beacon_node.pyand tests fortrinity-beacon.To-Do
Cute Animal Picture