e20f64b21a
## Issue Addressed resolves #2129 resolves #2099 addresses some of #1712 unblocks #2076 unblocks #2153 ## Proposed Changes - Updates all the dependencies mentioned in #2129, except for web3. They haven't merged their tokio 1.0 update because they are waiting on some dependencies of their own. Since we only use web3 in tests, I think updating it in a separate issue is fine. If they are able to merge soon though, I can update in this PR. - Updates `tokio_util` to 0.6.2 and `bytes` to 1.0.1. - We haven't made a discv5 release since merging tokio 1.0 updates so I'm using a commit rather than release atm. **Edit:** I think we should merge an update of `tokio_util` to 0.6.2 into discv5 before this release because it has panic fixes in `DelayQueue` --> PR in discv5: https://github.com/sigp/discv5/pull/58 ## Additional Info tokio 1.0 changes that required some changes in lighthouse: - `interval.next().await.is_some()` -> `interval.tick().await` - `sleep` future is now `!Unpin` -> https://github.com/tokio-rs/tokio/issues/3028 - `try_recv` has been temporarily removed from `mpsc` -> https://github.com/tokio-rs/tokio/issues/3350 - stream features have moved to `tokio-stream` and `broadcast::Receiver::into_stream()` has been temporarily removed -> `https://github.com/tokio-rs/tokio/issues/2870 - I've copied over the `BroadcastStream` wrapper from this PR, but can update to use `tokio-stream` once it's merged https://github.com/tokio-rs/tokio/pull/3384 Co-authored-by: realbigsean <seananderson33@gmail.com>
50 lines
1.4 KiB
Rust
50 lines
1.4 KiB
Rust
use beacon_chain::test_utils::EphemeralHarnessType;
|
|
use environment::null_logger;
|
|
use http_metrics::Config;
|
|
use reqwest::StatusCode;
|
|
use std::net::Ipv4Addr;
|
|
use std::sync::Arc;
|
|
use tokio::sync::oneshot;
|
|
use types::MainnetEthSpec;
|
|
|
|
type Context = http_metrics::Context<EphemeralHarnessType<MainnetEthSpec>>;
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn returns_200_ok() {
|
|
async {
|
|
let log = null_logger().unwrap();
|
|
|
|
let context = Arc::new(Context {
|
|
config: Config {
|
|
enabled: true,
|
|
listen_addr: Ipv4Addr::new(127, 0, 0, 1),
|
|
listen_port: 0,
|
|
allow_origin: None,
|
|
},
|
|
chain: None,
|
|
db_path: None,
|
|
freezer_db_path: None,
|
|
log,
|
|
});
|
|
|
|
let ctx = context.clone();
|
|
let (_shutdown_tx, shutdown_rx) = oneshot::channel::<()>();
|
|
let server_shutdown = async {
|
|
// It's not really interesting why this triggered, just that it happened.
|
|
let _ = shutdown_rx.await;
|
|
};
|
|
let (listening_socket, server) = http_metrics::serve(ctx, server_shutdown).unwrap();
|
|
|
|
tokio::spawn(async { server.await });
|
|
|
|
let url = format!(
|
|
"http://{}:{}/metrics",
|
|
listening_socket.ip(),
|
|
listening_socket.port()
|
|
);
|
|
|
|
assert_eq!(reqwest::get(&url).await.unwrap().status(), StatusCode::OK);
|
|
}
|
|
.await
|
|
}
|