From 3a4b51d47f6feafee8459c1a53fc5ea12ec9aaa5 Mon Sep 17 00:00:00 2001 From: Andre da Silva Date: Tue, 3 Dec 2024 00:06:42 -0300 Subject: [PATCH] RemoteNet -> ExistingNet --- .github/workflows/rust.yml | 6 +-- linera-service/Cargo.toml | 2 +- .../{remote_net.rs => existing_net.rs} | 24 ++++----- linera-service/src/cli_wrappers/mod.rs | 6 +-- linera-service/tests/linera_net_tests.rs | 52 +++++++++---------- 5 files changed, 45 insertions(+), 45 deletions(-) rename linera-service/src/cli_wrappers/{remote_net.rs => existing_net.rs} (85%) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 26e29cff013..06157c65fe7 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -40,7 +40,7 @@ permissions: contents: read jobs: - remote-net-test: + existing-net-test: runs-on: ubuntu-latest-8-cores timeout-minutes: 40 @@ -65,9 +65,9 @@ jobs: cargo run --bin linera -- resource-control-policy --block 0.0000001 cargo run --bin linera -- resource-control-policy --block 0.000000 cargo run --bin linera -- faucet --amount 1000 --port 8079 69705f85ac4c9fef6c02b4d83426aaaf05154c645ec1c61665f8e450f0468bc0 & - - name: Run the remote-net tests + - name: Run the existing-net tests run: | - cargo test -p linera-service remote_net_grpc --features remote-net + cargo test -p linera-service existing_net_grpc --features existing-net execution-wasmtime-test: runs-on: ubuntu-latest diff --git a/linera-service/Cargo.toml b/linera-service/Cargo.toml index bb8470b0d02..3848287cdb1 100644 --- a/linera-service/Cargo.toml +++ b/linera-service/Cargo.toml @@ -55,7 +55,7 @@ kubernetes = [ "dep:pathdiff", "dep:fs_extra", ] -remote-net = ["dep:k8s-openapi", "dep:kube"] +existing-net = [] metrics = ["prometheus", "linera-base/metrics", "linera-client/metrics"] storage-service = ["linera-client/storage-service", "linera-storage-service"] diff --git a/linera-service/src/cli_wrappers/remote_net.rs b/linera-service/src/cli_wrappers/existing_net.rs similarity index 85% rename from linera-service/src/cli_wrappers/remote_net.rs rename to linera-service/src/cli_wrappers/existing_net.rs index 79ad399875b..de6a69377e9 100644 --- a/linera-service/src/cli_wrappers/remote_net.rs +++ b/linera-service/src/cli_wrappers/existing_net.rs @@ -15,12 +15,12 @@ use super::{ Network, OnClientDrop, }; -pub struct RemoteNetTestingConfig { +pub struct ExistingNetTestingConfig { faucet: Faucet, } -impl RemoteNetTestingConfig { - /// Creates a new [`RemoteNetTestingConfig`] for running tests with an external Linera +impl ExistingNetTestingConfig { + /// Creates a new [`ExistingNetTestingConfig`] for running tests with an existing Linera /// network. /// /// The `faucet_url` is used to connect to the network and obtain its configuration, @@ -39,14 +39,14 @@ impl RemoteNetTestingConfig { } #[async_trait] -impl LineraNetConfig for RemoteNetTestingConfig { - type Net = RemoteNet; +impl LineraNetConfig for ExistingNetTestingConfig { + type Net = ExistingNet; async fn instantiate(self) -> Result<(Self::Net, ClientWrapper)> { let seed = 37; - let mut net = RemoteNet::new(Some(seed), &self.faucet) + let mut net = ExistingNet::new(Some(seed), &self.faucet) .await - .expect("Creating RemoteNet should not fail"); + .expect("Creating ExistingNet should not fail"); let client = net.make_client().await; // The tests assume we've created a genesis config with 2 @@ -78,7 +78,7 @@ impl LineraNetConfig for RemoteNetTestingConfig { /// Remote net #[derive(Clone)] -pub struct RemoteNet { +pub struct ExistingNet { network: Network, testing_prng_seed: Option, next_client_id: usize, @@ -86,10 +86,10 @@ pub struct RemoteNet { } #[async_trait] -impl LineraNet for RemoteNet { +impl LineraNet for ExistingNet { async fn ensure_is_running(&mut self) -> Result<()> { // Leaving this just returning for now. - // We would have to connect to each validator in the remote net then run + // We would have to connect to each validator in the existing net then run // ensure_connected_cluster_is_running Ok(()) } @@ -113,12 +113,12 @@ impl LineraNet for RemoteNet { } async fn terminate(&mut self) -> Result<()> { - // We're not killing the remote net :) + // We're not killing the existing network :) Ok(()) } } -impl RemoteNet { +impl ExistingNet { async fn new(testing_prng_seed: Option, faucet: &Faucet) -> Result { let tmp_dir = Arc::new(tempdir()?); // Write json config to disk diff --git a/linera-service/src/cli_wrappers/mod.rs b/linera-service/src/cli_wrappers/mod.rs index 0462aac4c96..3e032b6c442 100644 --- a/linera-service/src/cli_wrappers/mod.rs +++ b/linera-service/src/cli_wrappers/mod.rs @@ -8,6 +8,9 @@ /// How to run docker operations pub mod docker; +#[cfg(all(with_testing, feature = "existing-net"))] +/// How to connect to an existing/running network. +pub mod existing_net; #[cfg(feature = "kubernetes")] /// How to run helmfile operations mod helmfile; @@ -22,9 +25,6 @@ mod kubectl; pub mod local_kubernetes_net; /// How to run Linera validators locally as native processes. pub mod local_net; -#[cfg(all(with_testing, feature = "remote-net"))] -/// How to connect to running GCP DevNet. -pub mod remote_net; #[cfg(feature = "kubernetes")] /// Util functions for the wrappers mod util; diff --git a/linera-service/tests/linera_net_tests.rs b/linera-service/tests/linera_net_tests.rs index a34722bc708..4cdbde6f3c7 100644 --- a/linera-service/tests/linera_net_tests.rs +++ b/linera-service/tests/linera_net_tests.rs @@ -7,7 +7,7 @@ feature = "scylladb", feature = "storage-service", feature = "kubernetes", - feature = "remote-net" + feature = "existing-net" ))] mod common; @@ -34,14 +34,14 @@ use linera_base::{ use linera_chain::data_types::{Medium, Origin}; use linera_core::worker::{Notification, Reason}; use linera_sdk::{base::BlockHeight, DataBlobHash}; +#[cfg(feature = "existing-net")] +use linera_service::cli_wrappers::existing_net::ExistingNetTestingConfig; #[cfg(any( feature = "dynamodb", feature = "scylladb", feature = "storage-service", ))] use linera_service::cli_wrappers::local_net::{Database, LocalNetConfig}; -#[cfg(feature = "remote-net")] -use linera_service::cli_wrappers::remote_net::RemoteNetTestingConfig; #[cfg(any( feature = "dynamodb", feature = "scylladb", @@ -374,7 +374,7 @@ impl AmmApp { #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_ethereum_tracker(config: impl LineraNetConfig) -> Result<()> { use ethereum_tracker::{EthereumTrackerAbi, InstantiationArgument}; @@ -478,7 +478,7 @@ async fn test_wasm_end_to_end_ethereum_tracker(config: impl LineraNetConfig) -> #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_counter(config: impl LineraNetConfig) -> Result<()> { use counter::CounterAbi; @@ -531,7 +531,7 @@ async fn test_wasm_end_to_end_counter(config: impl LineraNetConfig) -> Result<() #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_counter_publish_create(config: impl LineraNetConfig) -> Result<()> { use counter::CounterAbi; @@ -581,7 +581,7 @@ async fn test_wasm_end_to_end_counter_publish_create(config: impl LineraNetConfi #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_social_user_pub_sub(config: impl LineraNetConfig) -> Result<()> { use linera_base::time::Instant; @@ -688,8 +688,8 @@ async fn test_wasm_end_to_end_social_user_pub_sub(config: impl LineraNetConfig) #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc), "native-fungible" ; "native_aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build), "fungible" ; "kubernetes_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build), "native-fungible" ; "native_kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None), "fungible" ; "remote_net_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None), "native-fungible" ; "native_remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None), "fungible" ; "existing_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None), "native-fungible" ; "native_existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_fungible( config: impl LineraNetConfig, @@ -852,8 +852,8 @@ async fn test_wasm_end_to_end_fungible( #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc), "native-fungible" ; "native_aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build), "fungible" ; "kubernetes_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build), "native-fungible" ; "native_kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None), "fungible" ; "remote_net_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None), "native-fungible" ; "native_remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None), "fungible" ; "existing_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None), "native-fungible" ; "native_existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_same_wallet_fungible( config: impl LineraNetConfig, @@ -975,7 +975,7 @@ async fn test_wasm_end_to_end_same_wallet_fungible( #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_non_fungible(config: impl LineraNetConfig) -> Result<()> { use non_fungible::{NftOutput, NonFungibleTokenAbi}; @@ -1253,7 +1253,7 @@ async fn test_wasm_end_to_end_non_fungible(config: impl LineraNetConfig) -> Resu #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_crowd_funding(config: impl LineraNetConfig) -> Result<()> { use std::collections::BTreeMap; @@ -1389,7 +1389,7 @@ async fn test_wasm_end_to_end_crowd_funding(config: impl LineraNetConfig) -> Res #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_matching_engine(config: impl LineraNetConfig) -> Result<()> { use std::collections::BTreeMap; @@ -1681,7 +1681,7 @@ async fn test_wasm_end_to_end_matching_engine(config: impl LineraNetConfig) -> R #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_wasm_end_to_end_amm(config: impl LineraNetConfig) -> Result<()> { use std::collections::BTreeMap; @@ -2424,7 +2424,7 @@ async fn test_resolve_binary() -> Result<()> { #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_open_chain_node_service(config: impl LineraNetConfig) -> Result<()> { use std::collections::BTreeMap; @@ -2546,7 +2546,7 @@ async fn test_open_chain_node_service(config: impl LineraNetConfig) -> Result<() #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_multiple_wallets(config: impl LineraNetConfig) -> Result<()> { let _guard = INTEGRATION_TEST_GUARD.lock().await; @@ -2592,7 +2592,7 @@ async fn test_end_to_end_multiple_wallets(config: impl LineraNetConfig) -> Resul #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_open_multi_owner_chain(config: impl LineraNetConfig) -> Result<()> { let _guard = INTEGRATION_TEST_GUARD.lock().await; @@ -2661,7 +2661,7 @@ async fn test_end_to_end_open_multi_owner_chain(config: impl LineraNetConfig) -> #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_change_ownership(config: impl LineraNetConfig) -> Result<()> { use linera_base::crypto::PublicKey; @@ -2703,7 +2703,7 @@ async fn test_end_to_end_change_ownership(config: impl LineraNetConfig) -> Resul #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_assign_greatgrandchild_chain(config: impl LineraNetConfig) -> Result<()> { let _guard = INTEGRATION_TEST_GUARD.lock().await; @@ -2749,7 +2749,7 @@ async fn test_end_to_end_assign_greatgrandchild_chain(config: impl LineraNetConf #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_publish_data_blob_in_cli(config: impl LineraNetConfig) -> Result<()> { let _guard = INTEGRATION_TEST_GUARD.lock().await; @@ -2781,7 +2781,7 @@ async fn test_end_to_end_publish_data_blob_in_cli(config: impl LineraNetConfig) #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_faucet(config: impl LineraNetConfig) -> Result<()> { let _guard = INTEGRATION_TEST_GUARD.lock().await; @@ -2858,7 +2858,7 @@ async fn test_end_to_end_faucet(config: impl LineraNetConfig) -> Result<()> { #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] #[ignore = "This test takes a long time to run"] async fn test_end_to_end_faucet_with_long_chains(config: impl LineraNetConfig) -> Result<()> { @@ -2917,7 +2917,7 @@ async fn test_end_to_end_faucet_with_long_chains(config: impl LineraNetConfig) - #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_fungible_client_benchmark(config: impl LineraNetConfig) -> Result<()> { use linera_base::command::CommandExt; @@ -2962,7 +2962,7 @@ async fn test_end_to_end_fungible_client_benchmark(config: impl LineraNetConfig) #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_listen_for_new_rounds(config: impl LineraNetConfig) -> Result<()> { use std::{ @@ -3077,7 +3077,7 @@ async fn test_end_to_end_listen_for_new_rounds(config: impl LineraNetConfig) -> #[cfg_attr(feature = "scylladb", test_case(LocalNetConfig::new_test(Database::ScyllaDb, Network::Grpc) ; "scylladb_grpc"))] #[cfg_attr(feature = "dynamodb", test_case(LocalNetConfig::new_test(Database::DynamoDb, Network::Grpc) ; "aws_grpc"))] #[cfg_attr(feature = "kubernetes", test_case(SharedLocalKubernetesNetTestingConfig::new(Network::Grpc, BuildArg::Build) ; "kubernetes_grpc"))] -#[cfg_attr(feature = "remote-net", test_case(RemoteNetTestingConfig::new(None) ; "remote_net_grpc"))] +#[cfg_attr(feature = "existing-net", test_case(ExistingNetTestingConfig::new(None) ; "existing_net_grpc"))] #[test_log::test(tokio::test)] async fn test_end_to_end_repeated_transfers(config: impl LineraNetConfig) -> Result<()> { let _guard = INTEGRATION_TEST_GUARD.lock().await;