gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-19 22:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove old fork_choice crate

Browse Source
This commit is contained in:
Paul Hauner
2019-06-23 15:05:16 +10:00
parent 77fba0b98e
commit 075c989375
25 changed files with 6 additions and 2690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
beacon_node/client/Cargo.toml
View File

@@ -10,7 +10,6 @@ network = { path = "../network" }
store = { path = "../store" }
http_server = { path = "../http_server" }
rpc = { path = "../rpc" }
fork_choice = { path = "../../eth2/fork_choice" }
prometheus = "^0.6"
types = { path = "../../eth2/types" }
tree_hash = { path = "../../eth2/utils/tree_hash" }

1
beacon_node/http_server/Cargo.toml
View File

@@ -16,7 +16,6 @@ types = { path = "../../eth2/types" }
ssz = { path = "../../eth2/utils/ssz" }
slot_clock = { path = "../../eth2/utils/slot_clock" }
protos = { path = "../../protos" }
fork_choice = { path = "../../eth2/fork_choice" }
grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] }
persistent = "^0.4"
protobuf = "2.0.2"

7
beacon_node/network/src/sync/simple_sync.rs
View File

@@ -517,7 +517,7 @@ impl<T: BeaconChainTypes> SimpleSync<T> {
self.process_block(peer_id.clone(), block.clone(), network, &"gossip")
{
match outcome {
BlockProcessingOutcome::Processed => SHOULD_FORWARD_GOSSIP_BLOCK,
BlockProcessingOutcome::Processed { .. } => SHOULD_FORWARD_GOSSIP_BLOCK,
BlockProcessingOutcome::ParentUnknown { .. } => {
self.import_queue
.enqueue_full_blocks(vec![block], peer_id.clone());
@@ -582,7 +582,7 @@ impl<T: BeaconChainTypes> SimpleSync<T> {
_ => true,
};
if processing_result == Some(BlockProcessingOutcome::Processed) {
if processing_result == Some(BlockProcessingOutcome::Processed { block_root }) {
successful += 1;
}
@@ -695,11 +695,12 @@ impl<T: BeaconChainTypes> SimpleSync<T> {
if let Ok(outcome) = processing_result {
match outcome {
BlockProcessingOutcome::Processed => {
BlockProcessingOutcome::Processed { block_root } => {
info!(
self.log, "Imported block from network";
"source" => source,
"slot" => block.slot,
"block_root" => format!("{}", block_root),
"peer" => format!("{:?}", peer_id),
);
}

3
beacon_node/rpc/src/beacon_block.rs
View File

@@ -95,12 +95,13 @@ impl<T: BeaconChainTypes> BeaconBlockService for BeaconBlockServiceInstance<T> {
Ok(block) => {
match self.chain.process_block(block.clone()) {
Ok(outcome) => {
if outcome == BlockProcessingOutcome::Processed {
if let BlockProcessingOutcome::Processed { block_root } = outcome {
// Block was successfully processed.
info!(
self.log,
"Valid block from RPC";
"block_slot" => block.slot,
"block_root" => format!("{}", block_root),
);
// TODO: Obtain topics from the network service properly.