mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-06 10:11:44 +00:00
rust 1.53.0 updates (#2411)
## Issue Addressed `make lint` failing on rust 1.53.0. ## Proposed Changes 1.53.0 updates ## Additional Info I haven't figure out why yet, we were now hitting the recursion limit in a few crates. So I had to add `#![recursion_limit = "256"]` in a few places Co-authored-by: realbigsean <seananderson33@gmail.com> Co-authored-by: Michael Sproul <michael@sigmaprime.io>
This commit is contained in:
@@ -1254,7 +1254,6 @@ pub fn serve<T: BeaconChainTypes>(
|
||||
|
||||
// GET config/fork_schedule
|
||||
let get_config_fork_schedule = config_path
|
||||
.clone()
|
||||
.and(warp::path("fork_schedule"))
|
||||
.and(warp::path::end())
|
||||
.and(chain_filter.clone())
|
||||
@@ -1268,7 +1267,6 @@ pub fn serve<T: BeaconChainTypes>(
|
||||
|
||||
// GET config/spec
|
||||
let get_config_spec = config_path
|
||||
.clone()
|
||||
.and(warp::path("spec"))
|
||||
.and(warp::path::end())
|
||||
.and(chain_filter.clone())
|
||||
@@ -1284,7 +1282,6 @@ pub fn serve<T: BeaconChainTypes>(
|
||||
|
||||
// GET config/deposit_contract
|
||||
let get_config_deposit_contract = config_path
|
||||
.clone()
|
||||
.and(warp::path("deposit_contract"))
|
||||
.and(warp::path::end())
|
||||
.and(chain_filter.clone())
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#![cfg(not(debug_assertions))] // Tests are too slow in debug.
|
||||
#![recursion_limit = "256"]
|
||||
|
||||
use beacon_chain::{
|
||||
test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType},
|
||||
@@ -2333,7 +2334,7 @@ async fn poll_events<S: Stream<Item = Result<EventKind<T>, eth2::Error>> + Unpin
|
||||
};
|
||||
|
||||
tokio::select! {
|
||||
_ = collect_stream_fut => {return events}
|
||||
_ = collect_stream_fut => {events}
|
||||
_ = tokio::time::sleep(timeout) => { return events; }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user