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

Merge branch 'unstable' into dvt

Browse Source
This commit is contained in:
chonghe
2025-05-09 11:06:44 +08:00
committed by GitHub
parent 9d8a9e7e70 4b9c16fc71
commit bcfe5ff2e8
101 changed files with 3863 additions and 2412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
common/eth2/src/lib.rs
View File

@@ -146,6 +146,7 @@ pub struct Timeouts {
pub get_debug_beacon_states: Duration,
pub get_deposit_snapshot: Duration,
pub get_validator_block: Duration,
pub default: Duration,
}
impl Timeouts {
@@ -165,6 +166,7 @@ impl Timeouts {
get_debug_beacon_states: timeout,
get_deposit_snapshot: timeout,
get_validator_block: timeout,
default: timeout,
}
}
}
@@ -239,7 +241,9 @@ impl BeaconNodeHttpClient {
url: U,
builder: impl FnOnce(RequestBuilder) -> RequestBuilder,
) -> Result<Response, Error> {
let response = builder(self.client.get(url)).send().await?;
let response = builder(self.client.get(url).timeout(self.timeouts.default))
.send()
.await?;
ok_or_error(response).await
}
@@ -402,11 +406,10 @@ impl BeaconNodeHttpClient {
body: &T,
timeout: Option<Duration>,
) -> Result<Response, Error> {
let mut builder = self.client.post(url);
if let Some(timeout) = timeout {
builder = builder.timeout(timeout);
}
let builder = self
.client
.post(url)
.timeout(timeout.unwrap_or(self.timeouts.default));
let response = builder.json(body).send().await?;
ok_or_error(response).await
}
@@ -419,10 +422,10 @@ impl BeaconNodeHttpClient {
timeout: Option<Duration>,
fork: ForkName,
) -> Result<Response, Error> {
let mut builder = self.client.post(url);
if let Some(timeout) = timeout {
builder = builder.timeout(timeout);
}
let builder = self
.client
.post(url)
.timeout(timeout.unwrap_or(self.timeouts.default));
let response = builder
.header(CONSENSUS_VERSION_HEADER, fork.to_string())
.json(body)
@@ -437,7 +440,7 @@ impl BeaconNodeHttpClient {
url: U,
body: &T,
) -> Result<Response, Error> {
let builder = self.client.post(url);
let builder = self.client.post(url).timeout(self.timeouts.default);
let mut headers = HeaderMap::new();
headers.insert(
@@ -456,10 +459,10 @@ impl BeaconNodeHttpClient {
timeout: Option<Duration>,
fork: ForkName,
) -> Result<Response, Error> {
let mut builder = self.client.post(url);
if let Some(timeout) = timeout {
builder = builder.timeout(timeout);
}
let builder = self
.client
.post(url)
.timeout(timeout.unwrap_or(self.timeouts.default));
let mut headers = HeaderMap::new();
headers.insert(
CONSENSUS_VERSION_HEADER,
@@ -1872,7 +1875,13 @@ impl BeaconNodeHttpClient {
.push("node")
.push("health");
let status = self.client.get(path).send().await?.status();
let status = self
.client
.get(path)
.timeout(self.timeouts.default)
.send()
.await?
.status();
if status == StatusCode::OK || status == StatusCode::PARTIAL_CONTENT {
Ok(status)
} else {