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

Remove error-chain dependency (#6628)

Browse Source 
* remove error-chain dependency

* rerun CI

* rerun CI
This commit is contained in:
Eitan Seri-Levi
2024-11-28 09:39:50 +07:00
committed by GitHub
parent 720f596021
commit 38f5f665e1
19 changed files with 29 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/network/src/error.rs
View File

@@ -1,8 +0,0 @@
// generates error types
use error_chain::error_chain;
error_chain! {
links {
Libp2p(lighthouse_network::error::Error, lighthouse_network::error::ErrorKind);
}
}

1
beacon_node/network/src/lib.rs
View File

@@ -1,5 +1,4 @@
/// This crate provides the network server for Lighthouse.
pub mod error;
pub mod service;
mod metrics;

3
beacon_node/network/src/router.rs
View File

@@ -5,7 +5,6 @@
//! syncing-related responses to the Sync manager.
#![allow(clippy::unit_arg)]
use crate::error;
use crate::network_beacon_processor::{InvalidBlockStorage, NetworkBeaconProcessor};
use crate::service::NetworkMessage;
use crate::status::status_message;
@@ -92,7 +91,7 @@ impl<T: BeaconChainTypes> Router<T> {
beacon_processor_send: BeaconProcessorSend<T::EthSpec>,
beacon_processor_reprocess_tx: mpsc::Sender<ReprocessQueueMessage>,
log: slog::Logger,
) -> error::Result<mpsc::UnboundedSender<RouterMessage<T::EthSpec>>> {
) -> Result<mpsc::UnboundedSender<RouterMessage<T::EthSpec>>, String> {
let message_handler_log = log.new(o!("service"=> "router"));
trace!(message_handler_log, "Service starting");

17
beacon_node/network/src/service.rs
View File

@@ -1,10 +1,10 @@
use crate::metrics;
use crate::nat;
use crate::network_beacon_processor::InvalidBlockStorage;
use crate::persisted_dht::{clear_dht, load_dht, persist_dht};
use crate::router::{Router, RouterMessage};
use crate::subnet_service::{SubnetService, SubnetServiceMessage, Subscription};
use crate::NetworkConfig;
use crate::{error, metrics};
use beacon_chain::{BeaconChain, BeaconChainTypes};
use beacon_processor::{work_reprocessing_queue::ReprocessQueueMessage, BeaconProcessorSend};
use futures::channel::mpsc::Sender;
@@ -208,11 +208,14 @@ impl<T: BeaconChainTypes> NetworkService<T> {
libp2p_registry: Option<&'_ mut Registry>,
beacon_processor_send: BeaconProcessorSend<T::EthSpec>,
beacon_processor_reprocess_tx: mpsc::Sender<ReprocessQueueMessage>,
) -> error::Result<(
NetworkService<T>,
Arc<NetworkGlobals<T::EthSpec>>,
NetworkSenders<T::EthSpec>,
)> {
) -> Result<
(
NetworkService<T>,
Arc<NetworkGlobals<T::EthSpec>>,
NetworkSenders<T::EthSpec>,
),
String,
> {
let network_log = executor.log().clone();
// build the channels for external comms
let (network_senders, network_receivers) = NetworkSenders::new();
@@ -367,7 +370,7 @@ impl<T: BeaconChainTypes> NetworkService<T> {
libp2p_registry: Option<&'_ mut Registry>,
beacon_processor_send: BeaconProcessorSend<T::EthSpec>,
beacon_processor_reprocess_tx: mpsc::Sender<ReprocessQueueMessage>,
) -> error::Result<(Arc<NetworkGlobals<T::EthSpec>>, NetworkSenders<T::EthSpec>)> {
) -> Result<(Arc<NetworkGlobals<T::EthSpec>>, NetworkSenders<T::EthSpec>), String> {
let (network_service, network_globals, network_senders) = Self::build(
beacon_chain,
config,