Skip to content
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

Move compile-time CCTL_CHAINSPEC and CCTL_CONFIG to runtime #172

Merged
merged 6 commits into from
Jul 26, 2024
Merged

Move compile-time CCTL_CHAINSPEC and CCTL_CONFIG to runtime #172

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10a3f78
Move compile-time `CCTL_CHAINSPEC` and `CCTL_CONFIG` to runtime.
koxu1996 Jul 25, 2024
0e9820d
Remove unused import.
koxu1996 Jul 25, 2024
59ff599
Fix error fallback.
koxu1996 Jul 26, 2024
5dbd03b
Merge branch 'main' into feature/use-runtime-env-for-cctl
koxu1996 Jul 26, 2024
c14cc3c
Merge branch 'main' into feature/use-runtime-env-for-cctl
koxu1996 Jul 26, 2024
28572da
Merge branch 'main' into feature/use-runtime-env-for-cctl
marijanp Jul 26, 2024
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
8 changes: 4 additions & 4 deletions kairos-cli/src/commands/run_cctl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::path::{Path, PathBuf};
use std::path::PathBuf;

use casper_client_types::{runtime_args, RuntimeArgs};
use kairos_test_utils::cctl::{CCTLNetwork, DeployableContract};
Expand All @@ -16,10 +16,10 @@ pub fn run() -> Result<String, CliError> {
path: contract_wasm_path,
};
println!("Deploying contract...");
let chainspec_path = Path::new(env!("CCTL_CHAINSPEC"));
let config_path = Path::new(env!("CCTL_CONFIG"));
let chainspec_path = PathBuf::from(std::env::var("CCTL_CHAINSPEC").unwrap());
let config_path = PathBuf::from(std::env::var("CCTL_CONFIG").unwrap());

let network = CCTLNetwork::run(None, Some(contract_to_deploy), Some(chainspec_path), Some(config_path))
let network = CCTLNetwork::run(None, Some(contract_to_deploy), Some(chainspec_path.as_path()), Some(config_path.as_path()))
.await
.unwrap();

Expand Down
14 changes: 10 additions & 4 deletions kairos-test-utils/src/cctl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,14 @@ impl CCTLNetwork {
chainspec_path: Option<&Path>,
config_path: Option<&Path>,
) -> anyhow::Result<CCTLNetwork> {
let chainspec_path = chainspec_path.unwrap_or_else(|| Path::new(env!("CCTL_CHAINSPEC")));
let config_path = config_path.unwrap_or_else(|| Path::new(env!("CCTL_CONFIG")));
let chainspec_path: String = chainspec_path
.map(|p| p.to_str().unwrap().to_owned())
.ok_or_else(|| std::env::var("CCTL_CHAINSPEC"))
.unwrap();
let config_path: String = config_path
.map(|p| p.to_str().unwrap().to_owned())
.ok_or_else(|| std::env::var("CCTL_CONFIG"))
.unwrap();

let working_dir = working_dir
.map(|dir| {
Expand All @@ -92,9 +98,9 @@ impl CCTLNetwork {
let mut setup_command = Command::new("cctl-infra-net-setup");
setup_command.env("CCTL_ASSETS", &assets_dir);

setup_command.arg(format!("chainspec={}", chainspec_path.to_str().unwrap()));
setup_command.arg(format!("chainspec={}", chainspec_path));

setup_command.arg(format!("config={}", config_path.to_str().unwrap()));
setup_command.arg(format!("config={}", config_path));

tracing::info!("Setting up network configuration");
let output = setup_command
Expand Down
9 changes: 4 additions & 5 deletions kairos-test-utils/tests/test_cctl_deploys_a_contract_successfully.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use casper_types::ContractHash;
use hex::FromHex;
use kairos_test_utils::cctl::CCTLNetwork;
use std::fs;
use std::path::Path;
use std::path::PathBuf;

use casper_client_types::{runtime_args, RuntimeArgs};
Expand Down Expand Up @@ -30,14 +29,14 @@ async fn test_cctl_deploys_a_contract_successfully() {
path: contract_wasm_path,
};

let chainspec = Path::new(env!("CCTL_CHAINSPEC"));
let config = Path::new(env!("CCTL_CONFIG"));
let chainspec = PathBuf::from(std::env::var("CCTL_CHAINSPEC").unwrap());
let config = PathBuf::from(std::env::var("CCTL_CONFIG").unwrap());

let network = CCTLNetwork::run(
None,
Some(contract_to_deploy),
Some(chainspec),
Some(config),
Some(chainspec.as_path()),
Some(config.as_path()),
)
.await
.unwrap();
Expand Down
17 changes: 11 additions & 6 deletions kairos-test-utils/tests/test_cctl_network_starts_and_terminates.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::path::Path;
use std::path::PathBuf;

use casper_client::{get_node_status, rpcs::results::ReactorState, JsonRpcId, Verbosity};
use kairos_test_utils::cctl::{CCTLNetwork, NodeState};
Expand All @@ -16,12 +16,17 @@ fn tracing_init() {
async fn test_cctl_network_starts_and_terminates() {
tracing_init();

let chainspec = Path::new(env!("CCTL_CHAINSPEC"));
let config = Path::new(env!("CCTL_CONFIG"));
let chainspec = PathBuf::from(std::env::var("CCTL_CHAINSPEC").unwrap());
let config = PathBuf::from(std::env::var("CCTL_CONFIG").unwrap());

let network = CCTLNetwork::run(None, None, Some(chainspec), Some(config))
.await
.unwrap();
let network = CCTLNetwork::run(
None,
None,
Some(chainspec.as_path()),
Some(config.as_path()),
)
.await
.unwrap();

for node in &network.nodes {
if node.state == NodeState::Running {
Expand Down
Loading