diff --git a/.gitignore b/.gitignore index 1fcb44145..dd5c1a072 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ lcov.info /vsc + +/target_dirs \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index a539caae4..69b9ea8b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,9 +75,9 @@ derivative = "2.2" derive_more = "0.99" either = "1.10" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.24" } -hotshot-types = { git = "https://github.com/EspressoSystems/hotshot-types", tag = "0.1.1" } -hotshot-utils = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.24" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "tag_0.5.25" } +hotshot-types = { git = "https://github.com/EspressoSystems/hotshot-types", tag = "0.1.5" } +hotshot-utils = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "tag_0.5.25" } itertools = "0.12.1" jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.1" } prometheus = "0.13" @@ -107,7 +107,7 @@ tokio-postgres = { version = "0.7", optional = true, default-features = false, f # Dependencies enabled by feature "testing". espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0", optional = true } -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.24", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "tag_0.5.25", optional = true } portpicker = { version = "0.1", optional = true } rand = { version = "0.8", optional = true } spin_sleep = { version = "1.2", optional = true } @@ -127,7 +127,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true } [dev-dependencies] espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" } generic-array = "0.14" -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.24" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "tag_0.5.25" } portpicker = "0.1" rand = "0.8" spin_sleep = "1.2" diff --git a/src/testing/consensus.rs b/src/testing/consensus.rs index 0af3aba19..d90220c8b 100644 --- a/src/testing/consensus.rs +++ b/src/testing/consensus.rs @@ -109,6 +109,7 @@ impl MockNetwork { election_config: None, da_staked_committee_size: pub_keys.len(), da_non_staked_committee_size: 0, + data_request_delay: Duration::from_millis(200), }; let pub_keys = pub_keys.clone();