From 14d9a98f808a784e305bd41598a35b655200a282 Mon Sep 17 00:00:00 2001 From: Edoardo Marangoni Date: Tue, 29 Oct 2024 13:59:14 +0100 Subject: [PATCH] feat: Rename `wasmer-api` in `argus` --- Cargo.lock | 54 +++++++++---------- tests/wasmer-argus/Cargo.toml | 4 +- tests/wasmer-argus/src/argus/config.rs | 2 +- tests/wasmer-argus/src/argus/mod.rs | 2 +- tests/wasmer-argus/src/argus/packages.rs | 2 +- .../src/argus/tester/cli_tester.rs | 2 +- .../src/argus/tester/lib_tester.rs | 2 +- tests/wasmer-argus/src/argus/tester/mod.rs | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 13ec136d362..bdb04fd75b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6270,56 +6270,56 @@ dependencies = [ ] [[package]] -name = "wasmer-api" -version = "0.1.0" +name = "wasmer-argus" +version = "5.0.0-rc.1" dependencies = [ "anyhow", - "async-tungstenite", - "base64", + "async-trait", + "clap", "cynic", + "derive_more", "futures", - "getrandom", - "graphql-ws-client", - "harsh", - "merge-streams", - "pin-project-lite", + "indicatif", + "log", "reqwest", "serde", "serde_json", - "serde_path_to_error", - "time 0.3.36", + "shared-buffer", "tokio", - "tokio-tungstenite 0.24.0", "tracing", + "tracing-subscriber", "url", - "uuid", - "wasmer-config", - "wasmer-package", + "wasmer", + "wasmer-backend-api", "webc", ] [[package]] -name = "wasmer-argus" -version = "5.0.0-rc.1" +name = "wasmer-backend-api" +version = "0.1.0" dependencies = [ "anyhow", - "async-trait", - "clap", + "async-tungstenite", + "base64", "cynic", - "derive_more", "futures", - "indicatif", - "log", + "getrandom", + "graphql-ws-client", + "harsh", + "merge-streams", + "pin-project-lite", "reqwest", "serde", "serde_json", - "shared-buffer", + "serde_path_to_error", + "time 0.3.36", "tokio", + "tokio-tungstenite 0.24.0", "tracing", - "tracing-subscriber", "url", - "wasmer", - "wasmer-api", + "uuid", + "wasmer-config", + "wasmer-package", "webc", ] @@ -6486,7 +6486,7 @@ dependencies = [ "walkdir", "wasm-coredump-builder", "wasmer", - "wasmer-api", + "wasmer-backend-api", "wasmer-compiler", "wasmer-compiler-cranelift", "wasmer-compiler-llvm", diff --git a/tests/wasmer-argus/Cargo.toml b/tests/wasmer-argus/Cargo.toml index 92150278856..6aa3db60828 100644 --- a/tests/wasmer-argus/Cargo.toml +++ b/tests/wasmer-argus/Cargo.toml @@ -19,7 +19,7 @@ cynic = "3.4.3" url = "2.5.0" futures = "0.3.30" tracing = "0.1.40" -tokio = { workspace = true, features = ["rt-multi-thread", "sync", "time", "fs"] } +tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread", "sync", "time", "fs"] } clap = {version = "4.4.11", features = ["derive", "string"]} tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } serde = { version = "1.0.197", features = ["derive"] } @@ -28,7 +28,7 @@ wasmer = { version = "5.0.0-rc.1", path = "../../lib/api", features = ["engine", derive_more = "0.99.17" webc.workspace = true async-trait = "0.1.77" -wasmer-api = { path = "../../lib/backend-api" } +wasmer-backend-api = { path = "../../lib/backend-api" } shared-buffer.workspace = true diff --git a/tests/wasmer-argus/src/argus/config.rs b/tests/wasmer-argus/src/argus/config.rs index 92c7bbdca4a..723e8b65ad9 100644 --- a/tests/wasmer-argus/src/argus/config.rs +++ b/tests/wasmer-argus/src/argus/config.rs @@ -57,7 +57,7 @@ pub struct ArgusConfig { #[arg(long)] pub cli_path: Option, - /// Whether or not this run should use the linked [`wasmer-api`] library instead of the CLI. + /// Whether or not this run should use the linked [`wasmer-backend-api`] library instead of the CLI. #[cfg(feature = "wasmer_lib")] #[arg(long, conflicts_with = "cli_path")] pub use_lib: bool, diff --git a/tests/wasmer-argus/src/argus/mod.rs b/tests/wasmer-argus/src/argus/mod.rs index 63260730592..dac35a4cb7d 100644 --- a/tests/wasmer-argus/src/argus/mod.rs +++ b/tests/wasmer-argus/src/argus/mod.rs @@ -16,7 +16,7 @@ use tokio::{ }; use tracing::*; use url::Url; -use wasmer_api::{types::PackageVersionWithPackage, WasmerClient}; +use wasmer_backend_api::{types::PackageVersionWithPackage, WasmerClient}; #[derive(Debug, Clone)] pub struct Argus { diff --git a/tests/wasmer-argus/src/argus/packages.rs b/tests/wasmer-argus/src/argus/packages.rs index d55dc03a0ff..6fd8a35a82e 100644 --- a/tests/wasmer-argus/src/argus/packages.rs +++ b/tests/wasmer-argus/src/argus/packages.rs @@ -11,7 +11,7 @@ use tokio::{ }; use tracing::*; use url::Url; -use wasmer_api::{ +use wasmer_backend_api::{ query::get_package_versions_stream, types::{AllPackageVersionsVars, PackageVersionSortBy, PackageVersionWithPackage}, }; diff --git a/tests/wasmer-argus/src/argus/tester/cli_tester.rs b/tests/wasmer-argus/src/argus/tester/cli_tester.rs index e84f0cd1274..5e621be6884 100644 --- a/tests/wasmer-argus/src/argus/tester/cli_tester.rs +++ b/tests/wasmer-argus/src/argus/tester/cli_tester.rs @@ -3,7 +3,7 @@ use indicatif::ProgressBar; use std::{fs::File, io::BufReader, path::Path, process::Command, sync::Arc}; use tokio::time::{self, Instant}; use tracing::*; -use wasmer_api::types::PackageVersionWithPackage; +use wasmer_backend_api::types::PackageVersionWithPackage; use webc::{v2::read::OwnedReader, v3::read::OwnedReader as OwnedReaderV3, Container, Version}; use super::{TestReport, Tester}; diff --git a/tests/wasmer-argus/src/argus/tester/lib_tester.rs b/tests/wasmer-argus/src/argus/tester/lib_tester.rs index 8d27bd290e9..d44b6929804 100644 --- a/tests/wasmer-argus/src/argus/tester/lib_tester.rs +++ b/tests/wasmer-argus/src/argus/tester/lib_tester.rs @@ -5,7 +5,7 @@ use std::{fs::File, io::BufReader, sync::Arc}; use tokio::time; use tracing::*; use wasmer::{sys::Features, Engine, NativeEngineExt, Target}; -use wasmer_api::types::PackageVersionWithPackage; +use wasmer_backend_api::types::PackageVersionWithPackage; use webc::{v2::read::OwnedReader, v3::read::OwnedReader as OwnedReaderV3, Container, Version}; pub struct LibRunner<'a> { diff --git a/tests/wasmer-argus/src/argus/tester/mod.rs b/tests/wasmer-argus/src/argus/tester/mod.rs index ea75446d068..8b8887f148f 100644 --- a/tests/wasmer-argus/src/argus/tester/mod.rs +++ b/tests/wasmer-argus/src/argus/tester/mod.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; use std::{sync::Arc, time::Duration}; -use wasmer_api::types::PackageVersionWithPackage; +use wasmer_backend_api::types::PackageVersionWithPackage; use super::ArgusConfig;