Merge stable futures

This commit is contained in:
Age Manning
2020-05-07 16:23:53 +10:00
105 changed files with 6367 additions and 3332 deletions

View File

@@ -2,14 +2,14 @@ use clap::{App, Arg, ArgMatches};
use clap_utils;
use environment::Environment;
use futures::{
future::{self, loop_fn, Loop},
future::{self, Loop},
Future,
};
use slog::{info, Logger};
use std::fs;
use std::path::PathBuf;
use std::time::{Duration, Instant};
use tokio::timer::Delay;
use tokio::time::Delay;
use types::EthSpec;
use validator_client::validator_directory::ValidatorDirectoryBuilder;
use web3::{