Skip to content

Commit

Permalink
Merge pull request #706 from EspressoSystems/hotshot/rc-0.5.77
Browse files Browse the repository at this point in the history
[WEEKLY RELEASE] HotShot - rc-0.5.77
  • Loading branch information
lukeiannucci authored Oct 7, 2024
2 parents 9151dc5 + ba73621 commit 36bb46f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 33 deletions.
46 changes: 23 additions & 23 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

[package]
name = "hotshot-query-service"
version = "0.1.61"
version = "0.1.62"
authors = ["Espresso Systems <hello@espressosys.com>"]
edition = "2021"
license = "GPL-3.0-or-later"
Expand Down Expand Up @@ -75,9 +75,9 @@ derivative = "2.2"
derive_more = "0.99"
either = "1.12"
futures = "0.3"
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.76" }
hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.76", features = ["dependency-tasks"] }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.76" }
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" }
hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77", features = ["dependency-tasks"] }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" }
itertools = "0.12.1"
jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"std",
Expand Down Expand Up @@ -119,7 +119,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.76", optional = true }
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77", optional = true }
portpicker = { version = "0.1", optional = true }
rand = { version = "0.8", optional = true }
spin_sleep = { version = "1.2", optional = true }
Expand All @@ -140,7 +140,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true }
clap = { version = "4.5", features = ["derive", "env"] }
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.76" }
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" }
portpicker = "0.1"
rand = "0.8"
reqwest = "0.12.3"
Expand Down
7 changes: 3 additions & 4 deletions src/testing/mocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ use crate::{
types::HeightIndexed,
};
use hotshot::traits::{
election::static_committee::GeneralStaticCommittee, implementations::MemoryNetwork,
NodeImplementation,
election::static_committee::StaticCommittee, implementations::MemoryNetwork, NodeImplementation,
};
use hotshot_example_types::{
auction_results_provider_types::{TestAuctionResult, TestAuctionResultsProvider},
Expand Down Expand Up @@ -133,7 +132,7 @@ impl NodeType for MockTypes {
type Transaction = MockTransaction;
type InstanceState = TestInstanceState;
type ValidatedState = TestValidatedState;
type Membership = GeneralStaticCommittee<Self>;
type Membership = StaticCommittee<Self>;
type BuilderSignatureKey = BLSPubKey;
type AuctionResult = TestAuctionResult;
}
Expand All @@ -155,7 +154,7 @@ impl Versions for MockVersions {
/// A type alias for the mock base version
pub type MockBase = <MockVersions as Versions>::Base;

pub type MockMembership = GeneralStaticCommittee<MockTypes>;
pub type MockMembership = StaticCommittee<MockTypes>;
pub type MockQuorumProposal = QuorumProposal<MockTypes>;
pub type MockNetwork = MemoryNetwork<BLSPubKey>;

Expand Down

0 comments on commit 36bb46f

Please sign in to comment.