Skip to content

Commit

Permalink
fix orchestrator manual start (#3707)
Browse files Browse the repository at this point in the history
  • Loading branch information
ss-es authored and rob-maron committed Sep 27, 2024
1 parent a0be89e commit 553af06
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion crates/orchestrator/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,6 @@ where
});
}

self.manual_start_allowed = false;
Ok(self.config.clone())
}

Expand Down Expand Up @@ -595,6 +594,7 @@ where
self.accepting_new_keys = false;
self.manual_start_allowed = false;
self.peer_pub_ready = true;
self.start = true;

Ok(())
}
Expand Down
10 changes: 5 additions & 5 deletions crates/task-impls/src/consensus2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@

use std::sync::Arc;

use self::handlers::{
handle_quorum_vote_recv, handle_timeout, handle_timeout_vote_recv, handle_view_change,
};
use crate::helpers::broadcast_event;
use crate::{events::HotShotEvent, vote_collection::VoteCollectorsMap};
use anyhow::Result;
use async_broadcast::{Receiver, Sender};
use async_lock::RwLock;
Expand All @@ -34,6 +29,11 @@ use hotshot_types::{
use tokio::task::JoinHandle;
use tracing::instrument;

use self::handlers::{
handle_quorum_vote_recv, handle_timeout, handle_timeout_vote_recv, handle_view_change,
};
use crate::{events::HotShotEvent, helpers::broadcast_event, vote_collection::VoteCollectorsMap};

/// Event handlers for use in the `handle` method.
mod handlers;

Expand Down
6 changes: 5 additions & 1 deletion crates/types/src/vid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ use lazy_static::lazy_static;
use serde::{Deserialize, Serialize};
use sha2::Sha256;

use crate::constants::SRS_DEGREE;
use crate::{
constants::SRS_DEGREE,
data::{VidDisperse as HotShotVidDisperse, VidDisperseShare},
message::Proposal,
};

/// VID scheme constructor.
///
Expand Down

0 comments on commit 553af06

Please sign in to comment.