Skip to content
This repository has been archived by the owner on Dec 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #233 from EspressoSystems/hotshot/rc-0.5.71
Browse files Browse the repository at this point in the history
[WEEKLY RELEASE] HotShot - rc-0.5.71
  • Loading branch information
rob-maron authored Aug 20, 2024
2 parents adf440c + 4165739 commit 3154544
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 46 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ jobs:
- uses: actions/checkout@v4
name: Checkout Repository

- name: Install Protoc
uses: arduino/setup-protoc@v2

- uses: dtolnay/rust-toolchain@stable

- name: Configure Git
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ jobs:
- uses: dtolnay/rust-toolchain@stable

- name: Install Protoc
uses: arduino/setup-protoc@v2

- name: Checkout Repository
uses: actions/checkout@v4

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/debug_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ jobs:
RUST_LOG: info
RUST_MIN_STACK: '3145728'
steps:
- name: Install Protoc
uses: arduino/setup-protoc@v2

- uses: dtolnay/rust-toolchain@stable

- uses: styfle/[email protected]
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ jobs:
- uses: actions/checkout@v4
name: Checkout Repository

- name: Install Protoc
uses: arduino/setup-protoc@v2

- uses: dtolnay/rust-toolchain@stable

- name: Configure Git
Expand Down
44 changes: 29 additions & 15 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ clap = { version = "4.5", features = ["derive", "env"] }
committable = "0.2"
derivative = "2.2"
futures = "0.3"
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.70" }
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.70" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.41" }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.70" }
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" }
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.42" }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" }
serde = { version = "1.0", features = ["derive"] }
sha2 = "0.10"
snafu = "0.8"
Expand All @@ -35,7 +35,7 @@ lru = "0.12.3"
hex = "0.4.3"

[dev-dependencies]
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.70" }
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" }

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = [
Expand Down
4 changes: 2 additions & 2 deletions src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ pub async fn run_non_permissioned_standalone_builder_service<Types: NodeType, V:
global_state: Arc<RwLock<GlobalState<Types>>>,
) -> Result<(), anyhow::Error> {
// connection to the events stream
let connected = connect_to_events_service::<Types, V>(hotshot_events_api_url.clone()).await;
let connected = connect_to_events_service::<_, V>(hotshot_events_api_url.clone()).await;
if connected.is_none() {
return Err(anyhow!(
"failed to connect to API at {hotshot_events_api_url}"
Expand Down Expand Up @@ -917,7 +917,7 @@ pub async fn run_non_permissioned_standalone_builder_service<Types: NodeType, V:
None => {
tracing::error!("Event stream ended");
let connected =
connect_to_events_service::<Types, V>(hotshot_events_api_url.clone()).await;
connect_to_events_service::<_, V>(hotshot_events_api_url.clone()).await;
if connected.is_none() {
return Err(anyhow!(
"failed to reconnect to API at {hotshot_events_api_url}"
Expand Down
16 changes: 4 additions & 12 deletions src/testing/basic_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@ mod tests {
<TestBlockPayload as BlockPayload<TestTypes>>::from_transactions(
vec![tx.clone()],
&TestValidatedState::default(),
&TestInstanceState {
..Default::default()
},
&TestInstanceState::default(),
)
.await
.unwrap();
Expand Down Expand Up @@ -206,9 +204,7 @@ mod tests {
0 => {
QuorumCertificate::<TestTypes>::genesis(
&TestValidatedState::default(),
&TestInstanceState {
..Default::default()
},
&TestInstanceState::default(),
)
.await
}
Expand Down Expand Up @@ -284,9 +280,7 @@ mod tests {
0 => {
Leaf::genesis(
&TestValidatedState::default(),
&TestInstanceState {
..Default::default()
},
&TestInstanceState::default(),
)
.await
}
Expand Down Expand Up @@ -380,9 +374,7 @@ mod tests {
NonZeroUsize::new(TEST_NUM_NODES_IN_VID_COMPUTATION).unwrap(),
Duration::from_millis(10), // max time to wait for non-zero txn block
0, // base fee
Arc::new(TestInstanceState {
..Default::default()
}),
Arc::new(TestInstanceState::default()),
Duration::from_secs(3600), // duration for txn garbage collection
Arc::new(TestValidatedState::default()),
);
Expand Down

0 comments on commit 3154544

Please sign in to comment.