Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to get rid of the yanked deps #4994

Merged
merged 10 commits into from
Dec 15, 2023
Merged

Update dependencies to get rid of the yanked deps #4994

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4276b10
Initial attempt to upgrade hashbrown to latest to get rid of the crat…
jimmygchen Dec 8, 2023
cbac3fa
Replace `.expect()` usage with use of `const`.
jimmygchen Dec 8, 2023
9ead643
Update ahash 0.7 as well
michaelsproul Dec 8, 2023
ec9b2a5
Remove unsafe code.
jimmygchen Dec 8, 2023
d2c8bf7
Merge branch 'update-deps' of github.com:jimmygchen/lighthouse into u…
jimmygchen Dec 8, 2023
33a58f2
Update `lru` to 0.12 and fix release test errors.
jimmygchen Dec 8, 2023
88e2093
Merge branch 'unstable' into update-deps
jimmygchen Dec 10, 2023
395fe19
Set non-blocking socket
michaelsproul Dec 11, 2023
d73fe56
Bump testcontainers to 0.15.
jimmygchen Dec 11, 2023
02d9bb4
Fix lint
jimmygchen Dec 11, 2023
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
Prev Previous commit
Next Next commit
Update lru to 0.12 and fix release test errors.
  • Loading branch information
@jimmygchen
jimmygchen committed Dec 8, 2023
commit 33a58f2443238182614f7a5d5a99deb5fa4fca20
32 changes: 7 additions & 25 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ itertools = "0.10"
lazy_static = "1"
libsecp256k1 = "0.7"
log = "0.4"
lru = "0.9"
lru = "0.12"
maplit = "1"
num_cpus = "1"
parking_lot = "0.12"
Expand Down Expand Up @@ -220,7 +220,7 @@ swap_or_not_shuffle = { path = "consensus/swap_or_not_shuffle" }
task_executor = { path = "common/task_executor" }
types = { path = "consensus/types" }
unused_port = { path = "common/unused_port" }
validator_client = { path = "validator_client/" }
validator_client = { path = "validator_client" }
validator_dir = { path = "common/validator_dir" }
warp_utils = { path = "common/warp_utils" }

Expand Down
15 changes: 12 additions & 3 deletions lighthouse/tests/beacon_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use std::str::FromStr;
use std::string::ToString;
use std::time::Duration;
use tempfile::TempDir;
use types::non_zero_usize::new_non_zero_usize;
use types::{
Address, Checkpoint, Epoch, ExecutionBlockHash, ForkName, Hash256, MainnetEthSpec,
ProgressiveBalancesMode,
Expand Down Expand Up @@ -1769,14 +1770,19 @@ fn block_cache_size_flag() {
CommandLineTest::new()
.flag("block-cache-size", Some("4"))
.run_with_zero_port()
.with_config(|config| assert_eq!(config.store.block_cache_size, 4_usize));
.with_config(|config| assert_eq!(config.store.block_cache_size, new_non_zero_usize(4)));
}
#[test]
fn historic_state_cache_size_flag() {
CommandLineTest::new()
.flag("historic-state-cache-size", Some("4"))
.run_with_zero_port()
.with_config(|config| assert_eq!(config.store.historic_state_cache_size, 4_usize));
.with_config(|config| {
assert_eq!(
config.store.historic_state_cache_size,
new_non_zero_usize(4)
)
});
}
#[test]
fn historic_state_cache_size_default() {
Expand Down Expand Up @@ -2001,7 +2007,10 @@ fn slasher_attestation_cache_size_flag() {
.slasher
.as_ref()
.expect("Unable to parse Slasher config");
assert_eq!(slasher_config.attestation_root_cache_size, 10000);
assert_eq!(
slasher_config.attestation_root_cache_size,
new_non_zero_usize(10000)
);
});
}
#[test]
Expand Down