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.

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

test: fix cucumber network environment #6175

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 1 deletion integration_tests/src/base_node_process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ use minotari_app_utilities::identity_management::save_as_json;
use minotari_node::{run_base_node, BaseNodeConfig, MetricsConfig};
use minotari_node_grpc_client::BaseNodeGrpcClient;
use rand::rngs::OsRng;
use tari_common::configuration::{CommonConfig, MultiaddrList};
use tari_common::{
configuration::{CommonConfig, MultiaddrList},
network_check::set_network_if_choice_valid,
};
use tari_comms::{multiaddr::Multiaddr, peer_manager::PeerFeatures, NodeIdentity};
use tari_comms_dht::{DbConnectionUrl, DhtConfig};
use tari_p2p::{auto_update::AutoUpdateConfig, Network, PeerSeedsConfig, TransportType};
Expand Down Expand Up @@ -88,6 +91,9 @@ pub async fn spawn_base_node_with_config(
peers: Vec<String>,
mut base_node_config: BaseNodeConfig,
) {
std::env::set_var("TARI_NETWORK", "localnet");
set_network_if_choice_valid(Network::LocalNet).unwrap();

let port: u64;
let grpc_port: u64;
let temp_dir_path: PathBuf;
Expand Down
5 changes: 4 additions & 1 deletion integration_tests/src/merge_mining_proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use minotari_app_utilities::common_cli_args::CommonCliArgs;
use minotari_merge_mining_proxy::{merge_miner, Cli};
use minotari_wallet_grpc_client::WalletGrpcClient;
use serde_json::{json, Value};
use tari_common::configuration::Network;
use tari_common::{configuration::Network, network_check::set_network_if_choice_valid};
use tari_common_types::{tari_address::TariAddress, types::PublicKey};
use tari_utilities::ByteArray;
use tempfile::tempdir;
Expand Down Expand Up @@ -74,6 +74,9 @@ pub async fn register_merge_mining_proxy_process(

impl MergeMiningProxyProcess {
pub async fn start(&self, world: &mut TariWorld) {
std::env::set_var("TARI_NETWORK", "localnet");
set_network_if_choice_valid(Network::LocalNet).unwrap();

let temp_dir = tempdir().unwrap();
let data_dir = temp_dir.path().join("data/miner");
let data_dir_str = data_dir.clone().into_os_string().into_string().unwrap();
Expand Down
5 changes: 4 additions & 1 deletion integration_tests/src/miner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use minotari_app_utilities::common_cli_args::CommonCliArgs;
use minotari_miner::{run_miner, Cli};
use minotari_node_grpc_client::BaseNodeGrpcClient;
use minotari_wallet_grpc_client::WalletGrpcClient;
use tari_common::configuration::Network;
use tari_common::{configuration::Network, network_check::set_network_if_choice_valid};
use tari_common_types::{tari_address::TariAddress, types::PublicKey};
use tari_core::{
consensus::ConsensusManager,
Expand Down Expand Up @@ -88,6 +88,9 @@ impl MinerProcess {
miner_min_diff: Option<u64>,
miner_max_diff: Option<u64>,
) {
std::env::set_var("TARI_NETWORK", "localnet");
set_network_if_choice_valid(Network::LocalNet).unwrap();

let mut wallet_client = create_wallet_client(world, self.wallet_name.clone())
.await
.expect("wallet grpc client");
Expand Down
8 changes: 7 additions & 1 deletion integration_tests/src/wallet_process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ use minotari_app_utilities::common_cli_args::CommonCliArgs;
use minotari_console_wallet::{run_wallet_with_cli, Cli};
use minotari_wallet::{transaction_service::config::TransactionRoutingMechanism, WalletConfig};
use minotari_wallet_grpc_client::WalletGrpcClient;
use tari_common::configuration::{CommonConfig, MultiaddrList};
use tari_common::{
configuration::{CommonConfig, MultiaddrList},
network_check::set_network_if_choice_valid,
};
use tari_comms::multiaddr::Multiaddr;
use tari_comms_dht::{DbConnectionUrl, DhtConfig};
use tari_p2p::{auto_update::AutoUpdateConfig, Network, PeerSeedsConfig, TransportType};
Expand Down Expand Up @@ -62,6 +65,9 @@ pub async fn spawn_wallet(
routing_mechanism: Option<TransactionRoutingMechanism>,
cli: Option<Cli>,
) {
std::env::set_var("TARI_NETWORK", "localnet");
set_network_if_choice_valid(Network::LocalNet).unwrap();

let port: u64;
let grpc_port: u64;
let temp_dir_path: PathBuf;
Expand Down
Loading