From adc0b9337d44e9dc9f9e88baeae9b6b3e8ee45ef Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 24 Aug 2020 12:13:54 +1000 Subject: [PATCH] Remove rayon from rest_api --- Cargo.lock | 1 - beacon_node/rest_api/Cargo.toml | 1 - beacon_node/rest_api/src/validator.rs | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12b8bbb0eb2..18e9e8b4792 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4285,7 +4285,6 @@ dependencies = [ "node_test_rig", "operation_pool", "parking_lot 0.11.0", - "rayon", "remote_beacon_node", "rest_types", "serde", diff --git a/beacon_node/rest_api/Cargo.toml b/beacon_node/rest_api/Cargo.toml index 6d023659c1a..38a5a1e7d55 100644 --- a/beacon_node/rest_api/Cargo.toml +++ b/beacon_node/rest_api/Cargo.toml @@ -34,7 +34,6 @@ hex = "0.4.2" parking_lot = "0.11.0" futures = "0.3.5" operation_pool = { path = "../operation_pool" } -rayon = "1.3.0" environment = { path = "../../lighthouse/environment" } uhttp_sse = "0.5.1" bus = "2.2.3" diff --git a/beacon_node/rest_api/src/validator.rs b/beacon_node/rest_api/src/validator.rs index 724719c5df9..e1c3c37dbf7 100644 --- a/beacon_node/rest_api/src/validator.rs +++ b/beacon_node/rest_api/src/validator.rs @@ -8,7 +8,6 @@ use bls::PublicKeyBytes; use eth2_libp2p::PubsubMessage; use hyper::Request; use network::NetworkMessage; -use rayon::prelude::*; use rest_types::{ValidatorDutiesRequest, ValidatorDutyBytes, ValidatorSubscription}; use slog::{error, info, trace, warn, Logger}; use std::sync::Arc; @@ -437,7 +436,7 @@ pub fn publish_attestations( .map( move |attestations: Vec<(Attestation, SubnetId)>| { attestations - .into_par_iter() + .into_iter() .enumerate() .map(|(i, (attestation, subnet_id))| { process_unaggregated_attestation( @@ -546,7 +545,7 @@ pub fn publish_aggregate_and_proofs( .map( move |signed_aggregates: Vec>| { signed_aggregates - .into_par_iter() + .into_iter() .enumerate() .map(|(i, signed_aggregate)| { process_aggregated_attestation(