Skip to content

Commit

Permalink
reactor: fix feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexD10S
AlexD10S committed Mar 28, 2024
1 parent 3eda0df commit ff45768
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 68 deletions.
95 changes: 50 additions & 45 deletions src/parachains/zombienet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,11 @@ mod tests {
use super::*;
use anyhow::Result;

const CONFIG_FILE_PATH: &str = "./tests/zombienet.toml";
const TESTING_POLKADOT_VERSION: &str = "v1.7.0";
const POLKADOT_BINARY: &str = "polkadot-v1.7.0";
const POLKADOT_PARACHAIN_BINARY: &str = "polkadot-parachain-v1.7.0";

#[tokio::test]
async fn test_new_success() -> Result<()> {
//cache
Expand All @@ -530,26 +535,26 @@ mod tests {

let zombienet = Zombienet::new(
cache.clone(),
"./tests/zombienet.toml",
Some(&"v1.7.0".to_string()),
Some(&"v1.7.0".to_string()),
CONFIG_FILE_PATH,
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&vec!["https://github.com/r0gue-io/pop-node".to_string()]),
)
.await?;

// Check has the binary for Polkadot
assert_eq!(zombienet.relay_chain.name, "polkadot-v1.7.0");
assert_eq!(zombienet.relay_chain.path, temp_dir.path().join("polkadot-v1.7.0"));
assert_eq!(zombienet.relay_chain.version, "v1.7.0");
assert_eq!(zombienet.relay_chain.name, POLKADOT_BINARY);
assert_eq!(zombienet.relay_chain.path, temp_dir.path().join(POLKADOT_BINARY));
assert_eq!(zombienet.relay_chain.version, TESTING_POLKADOT_VERSION);
assert_eq!(zombienet.relay_chain.sources.len(), 1);

// Check has the binary for the System Chain
assert_eq!(zombienet.parachains.len(), 2);

let system_chain = &zombienet.parachains[0];
assert_eq!(system_chain.name, "polkadot-parachain-v1.7.0");
assert_eq!(system_chain.path, temp_dir.path().join("polkadot-parachain-v1.7.0"));
assert_eq!(system_chain.version, "v1.7.0");
assert_eq!(system_chain.name, POLKADOT_PARACHAIN_BINARY);
assert_eq!(system_chain.path, temp_dir.path().join(POLKADOT_PARACHAIN_BINARY));
assert_eq!(system_chain.version, TESTING_POLKADOT_VERSION);
assert_eq!(system_chain.sources.len(), 1);

// Check has the binary for POP
Expand Down Expand Up @@ -578,8 +583,8 @@ mod tests {
let result_error = Zombienet::new(
cache.clone(),
toml_file_path,
Some(&"v1.7.0".to_string()),
Some(&"v1.7.0".to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&vec!["https://github.com/r0gue-io/pop-node".to_string()]),
)
.await;
Expand All @@ -598,15 +603,15 @@ mod tests {
let temp_dir = tempfile::tempdir().expect("Could not create temp dir");
let cache = PathBuf::from(temp_dir.path());
// Parse network config
let network_config_path = PathBuf::from("./tests/zombienet.toml");
let network_config_path = PathBuf::from(CONFIG_FILE_PATH);
let config = std::fs::read_to_string(&network_config_path)?.parse::<Document>()?;

let binary_relay_chain =
Zombienet::relay_chain(Some(&"v1.7.0".to_string()), &config, &cache).await?;
Zombienet::relay_chain(Some(&TESTING_POLKADOT_VERSION.to_string()), &config, &cache).await?;

assert_eq!(binary_relay_chain.name, "polkadot-v1.7.0");
assert_eq!(binary_relay_chain.path, temp_dir.path().join("polkadot-v1.7.0"));
assert_eq!(binary_relay_chain.version, "v1.7.0");
assert_eq!(binary_relay_chain.name, POLKADOT_BINARY);
assert_eq!(binary_relay_chain.path, temp_dir.path().join(POLKADOT_BINARY));
assert_eq!(binary_relay_chain.version, TESTING_POLKADOT_VERSION);
assert_eq!(binary_relay_chain.sources.len(), 1);

temp_dir.close()?;
Expand All @@ -619,7 +624,7 @@ mod tests {
let temp_dir = tempfile::tempdir().expect("Could not create temp dir");
let cache = PathBuf::from(temp_dir.path());
// Parse network config
let network_config_path = PathBuf::from("./tests/zombienet.toml");
let network_config_path = PathBuf::from(CONFIG_FILE_PATH);
let config = std::fs::read_to_string(&network_config_path)?.parse::<Document>()?;

// Ideally here we will Mock GitHub struct and its get_latest_release function response
Expand All @@ -645,7 +650,7 @@ mod tests {
let config = std::fs::read_to_string(&network_config_path)?.parse::<Document>()?;

let result_error =
Zombienet::relay_chain(Some(&"v1.7.0".to_string()), &config, &cache).await;
Zombienet::relay_chain(Some(&TESTING_POLKADOT_VERSION.to_string()), &config, &cache).await;
assert!(result_error.is_err());
let error_message = result_error.err().unwrap();
assert_eq!(error_message.root_cause().to_string(), "expected `relaychain`");
Expand All @@ -668,11 +673,11 @@ mod tests {
let temp_dir = tempfile::tempdir().expect("Could not create temp dir");
let cache = PathBuf::from(temp_dir.path());

let binary_system_chain = Zombienet::system_parachain(&"v1.7.0".to_string(), &cache)?;
let binary_system_chain = Zombienet::system_parachain(&TESTING_POLKADOT_VERSION.to_string(), &cache)?;

assert_eq!(binary_system_chain.name, "polkadot-parachain-v1.7.0");
assert_eq!(binary_system_chain.path, temp_dir.path().join("polkadot-parachain-v1.7.0"));
assert_eq!(binary_system_chain.version, "v1.7.0");
assert_eq!(binary_system_chain.name, POLKADOT_PARACHAIN_BINARY);
assert_eq!(binary_system_chain.path, temp_dir.path().join(POLKADOT_PARACHAIN_BINARY));
assert_eq!(binary_system_chain.version, TESTING_POLKADOT_VERSION);
assert_eq!(binary_system_chain.sources.len(), 1);

temp_dir.close()?;
Expand Down Expand Up @@ -706,9 +711,9 @@ mod tests {

let zombienet = Zombienet::new(
cache.clone(),
"./tests/zombienet.toml",
Some(&"v1.7.0".to_string()),
Some(&"v1.7.0".to_string()),
CONFIG_FILE_PATH,
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&vec!["https://github.com/r0gue-io/pop-node".to_string()]),
)
.await?;
Expand All @@ -727,18 +732,18 @@ mod tests {
let cache = PathBuf::from(temp_dir.path());

// Create "fake" binary files
let relay_chain_file_path = temp_dir.path().join("polkadot-v1.7.0");
let relay_chain_file_path = temp_dir.path().join(POLKADOT_BINARY);
File::create(relay_chain_file_path)?;
let system_chain_file_path = temp_dir.path().join("polkadot-parachain-v1.7.0");
let system_chain_file_path = temp_dir.path().join(POLKADOT_PARACHAIN_BINARY);
File::create(system_chain_file_path)?;
let pop_file_path = temp_dir.path().join("pop-node");
File::create(pop_file_path)?;

let zombienet = Zombienet::new(
cache.clone(),
"./tests/zombienet.toml",
Some(&"v1.7.0".to_string()),
Some(&"v1.7.0".to_string()),
CONFIG_FILE_PATH,
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&vec!["https://github.com/r0gue-io/pop-node".to_string()]),
)
.await?;
Expand All @@ -758,9 +763,9 @@ mod tests {

let mut zombienet = Zombienet::new(
cache.clone(),
"./tests/zombienet.toml",
Some(&"v1.7.0".to_string()),
Some(&"v1.7.0".to_string()),
CONFIG_FILE_PATH,
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&vec!["https://github.com/r0gue-io/pop-node".to_string()]),
)
.await?;
Expand All @@ -781,9 +786,9 @@ mod tests {

let mut zombienet = Zombienet::new(
cache.clone(),
"./tests/zombienet.toml",
Some(&"v1.7.0".to_string()),
Some(&"v1.7.0".to_string()),
CONFIG_FILE_PATH,
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&vec!["https://github.com/r0gue-io/pop-node".to_string()]),
)
.await?;
Expand All @@ -807,9 +812,9 @@ mod tests {

let mut zombienet = Zombienet::new(
cache.clone(),
"./tests/zombienet.toml",
Some(&"v1.7.0".to_string()),
Some(&"v1.7.0".to_string()),
CONFIG_FILE_PATH,
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&TESTING_POLKADOT_VERSION.to_string()),
Some(&vec!["https://github.com/r0gue-io/pop-node".to_string()]),
)
.await?;
Expand All @@ -829,12 +834,12 @@ mod tests {

let source = Source::Url {
name: "polkadot".to_string(),
version: "v1.7.0".to_string(),
version: TESTING_POLKADOT_VERSION.to_string(),
url: "https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/polkadot".to_string()
};
let result = source.process(&cache).await;
assert!(result.is_ok());
assert!(temp_dir.path().join("polkadot-v1.7.0").exists());
assert!(temp_dir.path().join(POLKADOT_BINARY).exists());

temp_dir.close()?;
Ok(())
Expand All @@ -846,7 +851,7 @@ mod tests {
let temp_dir = tempfile::tempdir().expect("Could not create temp dir");
let cache = PathBuf::from(temp_dir.path());

let version = "v1.7.0".to_string();
let version = TESTING_POLKADOT_VERSION.to_string();
let repo = Url::parse(POLKADOT_SDK).expect("repository url valid");
let source = Source::Git {
url: repo.into(),
Expand All @@ -861,15 +866,15 @@ mod tests {

let result = source.process(&cache).await;
assert!(result.is_ok());
assert!(temp_dir.path().join("polkadot-v1.7.0").exists());
assert!(temp_dir.path().join(POLKADOT_BINARY).exists());

temp_dir.close()?;
Ok(())
}
#[test]
fn test_versioned_name() -> Result<()> {
let versioned_name = Source::versioned_name("polkadot", Some(&"v1.7.0".to_string()));
assert_eq!(versioned_name, "polkadot-v1.7.0");
let versioned_name = Source::versioned_name("polkadot", Some(&TESTING_POLKADOT_VERSION.to_string()));
assert_eq!(versioned_name, POLKADOT_BINARY);

let versioned_name_no_version = Source::versioned_name("polkadot", None);
assert_eq!(versioned_name_no_version, "polkadot");
Expand Down
17 changes: 0 additions & 17 deletions tests/integration_tests.toml
View file

This file was deleted.

16 changes: 10 additions & 6 deletions tests/up_parachain.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use anyhow::Result;
use assert_cmd::{cargo::cargo_bin, Command as AssertCmd};
use std::{
fs,
path::PathBuf,
process::{Command, Stdio},
};
use tokio::time::{sleep, Duration};
Expand All @@ -15,7 +16,7 @@ fn setup_test_environment() -> Result<()> {
.success();
println!("Parachain created, building it");

// pup build parachain test_parachain
// pop build parachain test_parachain
AssertCmd::cargo_bin("pop")
.unwrap()
.args(&["build", "parachain", "-p", "./test_parachain"])
Expand All @@ -36,14 +37,17 @@ fn clean_test_environment() -> Result<()> {

#[tokio::test]
async fn test_parachain_up() -> Result<()> {
let _ = setup_test_environment();
setup_test_environment()?;

println!("pop parachain up -f ./tests/integration_tests.toml");
println!("pop up parachain -f ./test_parachain/network.toml");
let mut dir = PathBuf::new();
dir.push("test_parachain");

// pop up parachain
let mut cmd = Command::new(cargo_bin("pop"))
.current_dir(dir)
.stdout(Stdio::piped())
.args(&["up", "parachain", "-f", "./tests/integration_tests.toml"])
.args(&["up", "parachain", "-f", "./network.toml"])
.spawn()
.unwrap();

Expand All @@ -59,15 +63,15 @@ async fn test_parachain_up() -> Result<()> {
// }
// });

// If after 15 secs is still running probably excution is ok
// If after 15 secs is still running probably execution is ok
sleep(Duration::from_secs(15)).await;
assert!(cmd.try_wait().unwrap().is_none(), "the process should still be running");

// Stop the process
Command::new("kill").args(["-s", "TERM", &cmd.id().to_string()]).spawn()?;

// Clean up
let _ = clean_test_environment();
clean_test_environment()?;

Ok(())
}

0 comments on commit ff45768

Please sign in to comment.