Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ jobs:

ledger:
executor: rust-docker
resource_class: << pipeline.parameters.xlarge >>
resource_class: << pipeline.parameters.twoxlarge >>
steps:
- run_test:
workspace_member: snarkvm-ledger
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
alert-threshold: '150%'
comment-on-alert: true
fail-on-alert: true
alert-comment-cc-users: '@raychu86'
alert-comment-cc-users: '@vicsn'
# Only push the results on staging (see below)
auto-push: false
# Enable Job Summary for PRs
Expand Down
70 changes: 38 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions parameters/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,13 @@ version = "0.3.64"
features = ["XmlHttpRequest"]
optional = true

[target.'cfg(all(any(target_os = "android", target_os = "ios"), not(target_family = "wasm"), not(target_env = "sgx")))'.dependencies.reqwest]
version = "0.13"
default-features = false
features = ["blocking", "native-tls"]
[target.'cfg(all(any(target_os = "android", target_os = "ios"), not(target_family = "wasm"), not(target_env = "sgx")))'.dependencies.ureq]
workspace = true
features = ["native-tls"]

[target.'cfg(all(not(any(target_os = "android", target_os = "ios")), not(target_family = "wasm"), not(target_env = "sgx")))'.dependencies.reqwest]
version = "0.13"
default-features = false
features = ["blocking", "rustls"]
[target.'cfg(all(not(any(target_os = "android", target_os = "ios")), not(target_family = "wasm"), not(target_env = "sgx")))'.dependencies.ureq]
workspace = true
features = ["rustls"]

[dev-dependencies.snarkvm-algorithms]
path = "../algorithms"
Expand Down
6 changes: 3 additions & 3 deletions parameters/src/errors/parameter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ pub enum ParameterError {
}

#[cfg(all(not(feature = "wasm"), not(target_env = "sgx")))]
impl From<reqwest::Error> for ParameterError {
fn from(error: reqwest::Error) -> Self {
ParameterError::Crate("reqwest", format!("{error}"))
impl From<ureq::Error> for ParameterError {
fn from(error: ureq::Error) -> Self {
ParameterError::Crate("ureq", format!("{error}"))
}
}

Expand Down
35 changes: 17 additions & 18 deletions parameters/src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,33 +70,32 @@ macro_rules! impl_store_and_remote_fetch {

#[cfg(all(not(feature = "wasm"), not(target_env = "sgx")))]
fn remote_fetch(buffer: &mut Vec<u8>, url: &str) -> Result<(), $crate::errors::ParameterError> {
use std::io::Read;

#[cfg(not(feature = "no_std_out"))]
{
use colored::*;
let output = format!("{:>15} - Downloading \"{}\"", "Installation", url);
println!("{}", output.dimmed());
}

let host = url.split('/').nth(2).unwrap_or_default().to_string();
let retry_policy = reqwest::retry::for_host(host)
.max_retries_per_request(3)
.classify_fn(|req_rep| {
if req_rep.error().is_some() {
return req_rep.retryable();
// Retry up to 3 times on transient errors (5xx, 429, IO, timeout).
let mut attempts = 3u32;
loop {
match ureq::get(url).config().max_redirects(10).build().call() {
Ok(mut response) => {
response.body_mut().as_reader().read_to_end(buffer)?;
break;
}
match req_rep.status() {
Some(status) if status.is_server_error() || status.as_u16() == 429 => req_rep.retryable(),
_ => req_rep.success(),
Err(ureq::Error::StatusCode(code)) if attempts > 0 && (code >= 500 || code == 429) => {
attempts -= 1;
}
});

let client = reqwest::blocking::Client::builder()
.redirect(reqwest::redirect::Policy::limited(10)) // Limit to 10 redirects.
.retry(retry_policy)
.build()?;

let mut response = client.get(url).send()?.error_for_status()?;
response.copy_to(buffer)?;
Err(ureq::Error::Io(_) | ureq::Error::Timeout(_)) if attempts > 0 => {
attempts -= 1;
}
Err(err) => return Err(err.into()),
}
}

#[cfg(not(feature = "no_std_out"))]
{
Expand Down