Skip to content

Allow specification of the swarm directory by the caller #33

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

Draft
wants to merge 1 commit into
base: release
Choose a base branch
from
Draft

Allow specification of the swarm directory by the caller #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions testsuite/smoke-test/src/smoke_test_environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const SWARM_BUILD_NUM_RETRIES: u8 = 3;
#[derive(Clone)]
pub struct SwarmBuilder {
local: bool,
swarm_dir: Option<String>,
num_validators: NonZeroUsize,
num_fullnodes: usize,
genesis_framework: Option<ReleaseBundle>,
Expand All @@ -34,6 +35,7 @@ impl SwarmBuilder {
pub fn new(local: bool, num_validators: usize) -> Self {
Self {
local,
swarm_dir: None,
num_validators: NonZeroUsize::new(num_validators).unwrap(),
num_fullnodes: 0,
genesis_framework: None,
Expand Down Expand Up @@ -84,19 +86,18 @@ impl SwarmBuilder {
// TODO change to return Swarm trait
// Add support for forge
assert!(self.local);
static FACTORY: Lazy<LocalFactory> =
Lazy::new(|| LocalFactory::from_workspace(None).unwrap());
let version = FACTORY.versions().max().unwrap();
let factory = LocalFactory::from_workspace(self.swarm_dir.clone()).unwrap();
let version = factory.versions().max().unwrap();
info!("Node finished compiling");

let slots = self.num_validators.get() * 2;

static ACTIVE_NODES: Lazy<Arc<Mutex<usize>>> = Lazy::new(|| Arc::new(Mutex::new(0)));
let guard = ActiveNodesGuard::grab(slots, ACTIVE_NODES.clone()).await;
let active_nodes = Arc::new(Mutex::new(0));
let guard = ActiveNodesGuard::grab(slots, active_nodes.clone()).await;

let builder = self.clone();
let init_genesis_config = builder.init_genesis_config;
FACTORY
factory
.new_swarm_with_version(
OsRng,
builder.num_validators,
Expand Down Expand Up @@ -177,9 +178,10 @@ pub async fn new_local_swarm_with_diem(num_validators: usize) -> LocalSwarm {
//////// 0L ////////
// third party testsuites need to be able to start a swarm with
// a pre-compiled move release bundle.
pub async fn new_local_swarm_with_release(num_validators: usize, release: ReleaseBundle) -> LocalSwarm {
pub async fn new_local_swarm_with_release(num_validators: usize, release: ReleaseBundle, swarm_dir: Option<String>) -> LocalSwarm {
let mut sw = SwarmBuilder {
local: true,
swarm_dir,
num_validators: NonZeroUsize::new(num_validators).unwrap(),
num_fullnodes: 0,
genesis_framework: Some(release),
Expand Down