diff --git a/.gitignore b/.gitignore index 3976f9e2..44fa23f4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /tests /snot-control-data /snot-data +/snops-control-data +/snops-data diff --git a/Cargo.lock b/Cargo.lock index c1878ee5..92b6993b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4315,7 +4315,7 @@ dependencies = [ "snarkos-node", "snarkos-node-metrics", "snarkvm", - "snot-common", + "snops-common", "tikv-jemallocator", "tokio", "tower-http", @@ -5377,7 +5377,7 @@ dependencies = [ ] [[package]] -name = "snot" +name = "snops" version = "0.1.0" dependencies = [ "anyhow", @@ -5405,7 +5405,7 @@ dependencies = [ "serde_with", "serde_yaml", "sha2", - "snot-common", + "snops-common", "strum_macros", "surrealdb", "tarpc", @@ -5422,7 +5422,7 @@ dependencies = [ ] [[package]] -name = "snot-agent" +name = "snops-agent" version = "0.1.0" dependencies = [ "anyhow", @@ -5437,7 +5437,7 @@ dependencies = [ "nix", "reqwest 0.12.0", "simple_moving_average", - "snot-common", + "snops-common", "tarpc", "tokio", "tokio-tungstenite", @@ -5447,7 +5447,7 @@ dependencies = [ ] [[package]] -name = "snot-cli" +name = "snops-cli" version = "0.1.0" dependencies = [ "anyhow", @@ -5459,7 +5459,7 @@ dependencies = [ ] [[package]] -name = "snot-common" +name = "snops-common" version = "0.1.0" dependencies = [ "clap", diff --git a/Cargo.toml b/Cargo.toml index 329fabd6..9410f1b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] members = [ "crates/aot", - "crates/snot", - "crates/snot-agent", - "crates/snot-cli", - "crates/snot-common", + "crates/snops", + "crates/snops-agent", + "crates/snops-cli", + "crates/snops-common", ] resolver = "2" @@ -50,7 +50,7 @@ snarkos-account = { path = "../snarkos/account" } snarkos-cli = { path = "../snarkos/cli" } snarkos-node = { path = "../snarkos/node" } snarkvm = { path = "../snarkvm", features = ["rocks"] } -snot-common = { path = "./crates/snot-common" } +snops-common = { path = "./crates/snops-common" } [patch."https://github.com/AleoHQ/snarkVM.git"] snarkvm = { path = "../snarkvm" } diff --git a/crates/aot/Cargo.toml b/crates/aot/Cargo.toml index f111324d..91b70028 100644 --- a/crates/aot/Cargo.toml +++ b/crates/aot/Cargo.toml @@ -36,7 +36,7 @@ serde_json.workspace = true snarkos-account.workspace = true snarkos-node = { workspace = true, optional = true } snarkvm.workspace = true -snot-common.workspace = true +snops-common.workspace = true tokio.workspace = true tower-http.workspace = true tracing-flame = "0.2.0" diff --git a/crates/aot/src/runner/mod.rs b/crates/aot/src/runner/mod.rs index a2476349..ee6a522a 100644 --- a/crates/aot/src/runner/mod.rs +++ b/crates/aot/src/runner/mod.rs @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; use serde_clap_deserialize::serde_clap_default; use snarkos_node::Node; use snarkvm::{prelude::Block, utilities::FromBytes}; -use snot_common::state::NodeType; +use snops_common::state::NodeType; use crate::{ledger::Addrs, Account, PrivateKey}; diff --git a/crates/snot-agent/Cargo.toml b/crates/snops-agent/Cargo.toml similarity index 91% rename from crates/snot-agent/Cargo.toml rename to crates/snops-agent/Cargo.toml index 24c0e9d8..6b6f53a7 100644 --- a/crates/snot-agent/Cargo.toml +++ b/crates/snops-agent/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "snot-agent" +name = "snops-agent" version = "0.1.0" edition = "2021" @@ -17,7 +17,7 @@ httpdate = "1.0.3" local-ip-address = "0.6.1" nix = { workspace = true, features = ["signal"] } reqwest = { workspace = true, features = ["stream", "json"] } -snot-common = { path = "../snot-common" } +snops-common = { path = "../snops-common" } tarpc.workspace = true tokio.workspace = true tokio-tungstenite = "0.21.0" diff --git a/crates/snot-agent/src/api.rs b/crates/snops-agent/src/api.rs similarity index 98% rename from crates/snot-agent/src/api.rs rename to crates/snops-agent/src/api.rs index c4487ba2..23a584d6 100644 --- a/crates/snot-agent/src/api.rs +++ b/crates/snops-agent/src/api.rs @@ -3,7 +3,7 @@ use std::{os::unix::fs::PermissionsExt, path::Path}; use futures::StreamExt; use http::StatusCode; use reqwest::IntoUrl; -use snot_common::api::StorageInfoResponse; +use snops_common::api::StorageInfoResponse; use tokio::{fs::File, io::AsyncWriteExt}; use tracing::info; diff --git a/crates/snot-agent/src/cli.rs b/crates/snops-agent/src/cli.rs similarity index 94% rename from crates/snot-agent/src/cli.rs rename to crates/snops-agent/src/cli.rs index ab468cf5..28b0987b 100644 --- a/crates/snot-agent/src/cli.rs +++ b/crates/snops-agent/src/cli.rs @@ -6,10 +6,10 @@ use std::{ use clap::Parser; use http::Uri; -use snot_common::state::{AgentId, AgentMode, PortConfig}; +use snops_common::state::{AgentId, AgentMode, PortConfig}; use tracing::{info, warn}; -pub const ENV_ENDPOINT: &str = "SNOT_ENDPOINT"; +pub const ENV_ENDPOINT: &str = "SNOPS_ENDPOINT"; pub const ENV_ENDPOINT_DEFAULT: SocketAddr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 1234); // TODO: allow agents to define preferred internal/external addrs @@ -33,7 +33,7 @@ pub struct Cli { pub labels: Option>, /// Path to the directory containing the stored data and configuration - #[arg(long, default_value = "./snot-data")] + #[arg(long, default_value = "./snops-data")] pub path: PathBuf, /// Enable the agent to fetch its external address. Necessary to determine diff --git a/crates/snot-agent/src/main.rs b/crates/snops-agent/src/main.rs similarity index 97% rename from crates/snot-agent/src/main.rs rename to crates/snops-agent/src/main.rs index 267f52ba..ad226c30 100644 --- a/crates/snot-agent/src/main.rs +++ b/crates/snops-agent/src/main.rs @@ -15,7 +15,7 @@ use cli::Cli; use futures::{executor::block_on, SinkExt}; use futures_util::stream::{FuturesUnordered, StreamExt}; use http::HeaderValue; -use snot_common::rpc::{agent::AgentService, control::ControlServiceClient, RpcTransport}; +use snops_common::rpc::{agent::AgentService, control::ControlServiceClient, RpcTransport}; use tarpc::server::Channel; use tokio::{ select, @@ -53,7 +53,7 @@ async fn main() { tracing_subscriber::registry() .with( tracing_subscriber::EnvFilter::builder() - .with_env_var("SNOT_AGENT_LOG") + .with_env_var("SNOPS_AGENT_LOG") .with_default_directive(LevelFilter::TRACE.into()) .from_env_lossy() .add_directive("neli=off".parse().unwrap()) @@ -252,7 +252,7 @@ async fn main() { } } - info!("snot agent has shut down gracefully :)"); + info!("snops agent has shut down gracefully :)"); } struct Signals { diff --git a/crates/snot-agent/src/metrics/mod.rs b/crates/snops-agent/src/metrics/mod.rs similarity index 100% rename from crates/snot-agent/src/metrics/mod.rs rename to crates/snops-agent/src/metrics/mod.rs diff --git a/crates/snot-agent/src/metrics/tps.rs b/crates/snops-agent/src/metrics/tps.rs similarity index 100% rename from crates/snot-agent/src/metrics/tps.rs rename to crates/snops-agent/src/metrics/tps.rs diff --git a/crates/snot-agent/src/net.rs b/crates/snops-agent/src/net.rs similarity index 100% rename from crates/snot-agent/src/net.rs rename to crates/snops-agent/src/net.rs diff --git a/crates/snot-agent/src/rpc.rs b/crates/snops-agent/src/rpc.rs similarity index 99% rename from crates/snot-agent/src/rpc.rs rename to crates/snops-agent/src/rpc.rs index c8dd52a5..a6e5ae70 100644 --- a/crates/snot-agent/src/rpc.rs +++ b/crates/snops-agent/src/rpc.rs @@ -2,7 +2,7 @@ use std::{ collections::HashSet, fs, net::IpAddr, ops::Deref, process::Stdio, sync::Arc, time::Duration, }; -use snot_common::{ +use snops_common::{ rpc::{ agent::{AgentMetric, AgentService, AgentServiceRequest, AgentServiceResponse}, control::{ControlServiceRequest, ControlServiceResponse}, diff --git a/crates/snot-agent/src/state.rs b/crates/snops-agent/src/state.rs similarity index 99% rename from crates/snot-agent/src/state.rs rename to crates/snops-agent/src/state.rs index 1be32f87..d6e76da7 100644 --- a/crates/snot-agent/src/state.rs +++ b/crates/snops-agent/src/state.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, Mutex}, }; -use snot_common::{ +use snops_common::{ api::StorageInfoResponse, rpc::control::ControlServiceClient, state::{AgentId, AgentPeer, AgentState}, diff --git a/crates/snot-cli/Cargo.toml b/crates/snops-cli/Cargo.toml similarity index 94% rename from crates/snot-cli/Cargo.toml rename to crates/snops-cli/Cargo.toml index e7f81ac0..381c6cc3 100644 --- a/crates/snot-cli/Cargo.toml +++ b/crates/snops-cli/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "snot-cli" +name = "snops-cli" version = "0.1.0" edition = "2021" diff --git a/crates/snot-cli/src/cli.rs b/crates/snops-cli/src/cli.rs similarity index 85% rename from crates/snot-cli/src/cli.rs rename to crates/snops-cli/src/cli.rs index b7625341..99585baa 100644 --- a/crates/snot-cli/src/cli.rs +++ b/crates/snops-cli/src/cli.rs @@ -2,7 +2,7 @@ use anyhow::Result; use clap::Parser; #[derive(Debug, Parser)] -#[clap(name = "snot-cli", author = "MONADIC.US")] +#[clap(name = "snops-cli", author = "MONADIC.US")] pub struct Cli { /// The subcommand to run. #[clap(subcommand)] diff --git a/crates/snot-cli/src/commands/env.rs b/crates/snops-cli/src/commands/env.rs similarity index 100% rename from crates/snot-cli/src/commands/env.rs rename to crates/snops-cli/src/commands/env.rs diff --git a/crates/snot-cli/src/commands/mod.rs b/crates/snops-cli/src/commands/mod.rs similarity index 100% rename from crates/snot-cli/src/commands/mod.rs rename to crates/snops-cli/src/commands/mod.rs diff --git a/crates/snot-cli/src/main.rs b/crates/snops-cli/src/main.rs similarity index 100% rename from crates/snot-cli/src/main.rs rename to crates/snops-cli/src/main.rs diff --git a/crates/snot-common/Cargo.toml b/crates/snops-common/Cargo.toml similarity index 94% rename from crates/snot-common/Cargo.toml rename to crates/snops-common/Cargo.toml index 69025557..193d726b 100644 --- a/crates/snot-common/Cargo.toml +++ b/crates/snops-common/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "snot-common" +name = "snops-common" version = "0.1.0" edition = "2021" diff --git a/crates/snot-common/src/api.rs b/crates/snops-common/src/api.rs similarity index 100% rename from crates/snot-common/src/api.rs rename to crates/snops-common/src/api.rs diff --git a/crates/snot-common/src/lib.rs b/crates/snops-common/src/lib.rs similarity index 100% rename from crates/snot-common/src/lib.rs rename to crates/snops-common/src/lib.rs diff --git a/crates/snot-common/src/rpc/agent.rs b/crates/snops-common/src/rpc/agent.rs similarity index 100% rename from crates/snot-common/src/rpc/agent.rs rename to crates/snops-common/src/rpc/agent.rs diff --git a/crates/snot-common/src/rpc/control.rs b/crates/snops-common/src/rpc/control.rs similarity index 100% rename from crates/snot-common/src/rpc/control.rs rename to crates/snops-common/src/rpc/control.rs diff --git a/crates/snot-common/src/rpc/error.rs b/crates/snops-common/src/rpc/error.rs similarity index 100% rename from crates/snot-common/src/rpc/error.rs rename to crates/snops-common/src/rpc/error.rs diff --git a/crates/snot-common/src/rpc/mod.rs b/crates/snops-common/src/rpc/mod.rs similarity index 100% rename from crates/snot-common/src/rpc/mod.rs rename to crates/snops-common/src/rpc/mod.rs diff --git a/crates/snot-common/src/set.rs b/crates/snops-common/src/set.rs similarity index 100% rename from crates/snot-common/src/set.rs rename to crates/snops-common/src/set.rs diff --git a/crates/snot-common/src/state.rs b/crates/snops-common/src/state.rs similarity index 100% rename from crates/snot-common/src/state.rs rename to crates/snops-common/src/state.rs diff --git a/crates/snot/Cargo.toml b/crates/snops/Cargo.toml similarity index 95% rename from crates/snot/Cargo.toml rename to crates/snops/Cargo.toml index b247d948..fdf76672 100644 --- a/crates/snot/Cargo.toml +++ b/crates/snops/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "snot" +name = "snops" version = "0.1.0" edition = "2021" @@ -29,7 +29,7 @@ serde_json.workspace = true serde_yaml.workspace = true serde_with = "3.7" sha2 = "0.10.8" -snot-common = { path = "../snot-common" } +snops-common = { path = "../snops-common" } strum_macros = "0.26" surrealdb = { version = "1.3", default-features = false, features = [ "kv-rocksdb", diff --git a/crates/snot/src/cannon/authorized.rs b/crates/snops/src/cannon/authorized.rs similarity index 100% rename from crates/snot/src/cannon/authorized.rs rename to crates/snops/src/cannon/authorized.rs diff --git a/crates/snot/src/cannon/error.rs b/crates/snops/src/cannon/error.rs similarity index 99% rename from crates/snot/src/cannon/error.rs rename to crates/snops/src/cannon/error.rs index fe14666a..5ee5759c 100644 --- a/crates/snot/src/cannon/error.rs +++ b/crates/snops/src/cannon/error.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; use axum::http::StatusCode; use serde::{ser::SerializeStruct, Serialize, Serializer}; -use snot_common::{ +use snops_common::{ impl_into_status_code, impl_serialize_pretty_error, rpc::error::PrettyError, state::NodeKey, }; use strum_macros::AsRefStr; diff --git a/crates/snot/src/cannon/file.rs b/crates/snops/src/cannon/file.rs similarity index 100% rename from crates/snot/src/cannon/file.rs rename to crates/snops/src/cannon/file.rs diff --git a/crates/snot/src/cannon/mod.rs b/crates/snops/src/cannon/mod.rs similarity index 99% rename from crates/snot/src/cannon/mod.rs rename to crates/snops/src/cannon/mod.rs index 48f32b1c..f95756ce 100644 --- a/crates/snot/src/cannon/mod.rs +++ b/crates/snops/src/cannon/mod.rs @@ -12,7 +12,7 @@ use std::{ }; use futures_util::{stream::FuturesUnordered, StreamExt}; -use snot_common::state::AgentPeer; +use snops_common::state::AgentPeer; use tokio::{ process::Command, sync::mpsc::{UnboundedReceiver, UnboundedSender}, diff --git a/crates/snot/src/cannon/net.rs b/crates/snops/src/cannon/net.rs similarity index 100% rename from crates/snot/src/cannon/net.rs rename to crates/snops/src/cannon/net.rs diff --git a/crates/snot/src/cannon/router.rs b/crates/snops/src/cannon/router.rs similarity index 100% rename from crates/snot/src/cannon/router.rs rename to crates/snops/src/cannon/router.rs diff --git a/crates/snot/src/cannon/sink.rs b/crates/snops/src/cannon/sink.rs similarity index 100% rename from crates/snot/src/cannon/sink.rs rename to crates/snops/src/cannon/sink.rs diff --git a/crates/snot/src/cannon/source.rs b/crates/snops/src/cannon/source.rs similarity index 99% rename from crates/snot/src/cannon/source.rs rename to crates/snops/src/cannon/source.rs index 037c58aa..5f474f46 100644 --- a/crates/snot/src/cannon/source.rs +++ b/crates/snops/src/cannon/source.rs @@ -2,7 +2,7 @@ use std::collections::HashSet; use serde::{Deserialize, Serialize}; use serde_json::json; -use snot_common::{lasso::Spur, state::NodeKey, INTERN}; +use snops_common::{lasso::Spur, state::NodeKey, INTERN}; use super::{ authorized::Authorize, diff --git a/crates/snot/src/cli.rs b/crates/snops/src/cli.rs similarity index 85% rename from crates/snot/src/cli.rs rename to crates/snops/src/cli.rs index 98c85ee0..07e0daa7 100644 --- a/crates/snot/src/cli.rs +++ b/crates/snops/src/cli.rs @@ -8,7 +8,7 @@ pub struct Cli { /// Control plane server port pub port: u16, - #[arg(long, default_value = "snot-control-data")] + #[arg(long, default_value = "snops-control-data")] /// Path to the directory containing the stored data pub path: PathBuf, diff --git a/crates/snot/src/env/error.rs b/crates/snops/src/env/error.rs similarity index 99% rename from crates/snot/src/env/error.rs rename to crates/snops/src/env/error.rs index ea7b5dd6..a26239c5 100644 --- a/crates/snot/src/env/error.rs +++ b/crates/snops/src/env/error.rs @@ -1,6 +1,6 @@ use axum::http::StatusCode; use serde::{ser::SerializeStruct, Serialize, Serializer}; -use snot_common::{ +use snops_common::{ impl_into_status_code, impl_serialize_pretty_error, rpc::error::PrettyError, state::{AgentId, NodeKey}, diff --git a/crates/snot/src/env/mod.rs b/crates/snops/src/env/mod.rs similarity index 99% rename from crates/snot/src/env/mod.rs rename to crates/snops/src/env/mod.rs index 60224ad4..39c692e4 100644 --- a/crates/snot/src/env/mod.rs +++ b/crates/snops/src/env/mod.rs @@ -16,7 +16,7 @@ use bimap::{BiHashMap, BiMap}; use futures_util::future::join_all; use indexmap::{map::Entry, IndexMap}; use serde::Deserialize; -use snot_common::state::{AgentId, AgentPeer, AgentState, NodeKey}; +use snops_common::state::{AgentId, AgentPeer, AgentState, NodeKey}; use tokio::{ sync::{Mutex, RwLock}, task::JoinHandle, diff --git a/crates/snot/src/env/set.rs b/crates/snops/src/env/set.rs similarity index 99% rename from crates/snot/src/env/set.rs rename to crates/snops/src/env/set.rs index 47544fb6..7be0d327 100644 --- a/crates/snot/src/env/set.rs +++ b/crates/snops/src/env/set.rs @@ -6,7 +6,7 @@ use std::{ use fixedbitset::FixedBitSet; use indexmap::IndexMap; use rayon::iter::{IntoParallelIterator, ParallelIterator}; -use snot_common::{ +use snops_common::{ lasso::Spur, set::MASK_PREFIX_LEN, state::{AgentId, NodeKey}, diff --git a/crates/snot/src/env/timeline.rs b/crates/snops/src/env/timeline.rs similarity index 99% rename from crates/snot/src/env/timeline.rs rename to crates/snops/src/env/timeline.rs index 0c14b4d8..8ed21c7c 100644 --- a/crates/snot/src/env/timeline.rs +++ b/crates/snops/src/env/timeline.rs @@ -4,7 +4,7 @@ use std::{ }; use futures_util::future::join_all; -use snot_common::state::{AgentId, AgentState}; +use snops_common::state::{AgentId, AgentState}; use tokio::{select, sync::RwLock, task::JoinHandle}; use tracing::{debug, error, info}; diff --git a/crates/snot/src/error.rs b/crates/snops/src/error.rs similarity index 89% rename from crates/snot/src/error.rs rename to crates/snops/src/error.rs index ffa21086..10e28566 100644 --- a/crates/snot/src/error.rs +++ b/crates/snops/src/error.rs @@ -1,9 +1,9 @@ use std::process::ExitStatus; use serde::{ser::SerializeStruct, Serialize, Serializer}; -use snot_common::rpc::error::PrettyError; -use snot_common::state::AgentId; -use snot_common::{impl_into_status_code, impl_serialize_pretty_error}; +use snops_common::rpc::error::PrettyError; +use snops_common::state::AgentId; +use snops_common::{impl_into_status_code, impl_serialize_pretty_error}; use strum_macros::AsRefStr; use thiserror::Error; @@ -54,11 +54,11 @@ impl_into_status_code!(DeserializeError); #[derive(Debug, Error, AsRefStr)] pub enum StateError { #[error("common agent error: {0}")] - Agent(#[from] snot_common::prelude::error::AgentError), + Agent(#[from] snops_common::prelude::error::AgentError), #[error("source agent has no addr id: `{0}`")] NoAddress(AgentId), #[error("common reconcile error: {0}")] - Reconcile(#[from] snot_common::prelude::error::ReconcileError), + Reconcile(#[from] snops_common::prelude::error::ReconcileError), #[error("rpc error: {0}")] Rpc(#[from] tarpc::client::RpcError), #[error("source agent not found id: `{0}`")] diff --git a/crates/snot/src/logging.rs b/crates/snops/src/logging.rs similarity index 100% rename from crates/snot/src/logging.rs rename to crates/snops/src/logging.rs diff --git a/crates/snot/src/main.rs b/crates/snops/src/main.rs similarity index 100% rename from crates/snot/src/main.rs rename to crates/snops/src/main.rs diff --git a/crates/snot/src/schema/cannon.rs b/crates/snops/src/schema/cannon.rs similarity index 100% rename from crates/snot/src/schema/cannon.rs rename to crates/snops/src/schema/cannon.rs diff --git a/crates/snot/src/schema/error.rs b/crates/snops/src/schema/error.rs similarity index 97% rename from crates/snot/src/schema/error.rs rename to crates/snops/src/schema/error.rs index ee643e2c..eb365e48 100644 --- a/crates/snot/src/schema/error.rs +++ b/crates/snops/src/schema/error.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; use axum::http::StatusCode; use serde::{ser::SerializeStruct, Serialize, Serializer}; -use snot_common::{impl_into_status_code, impl_serialize_pretty_error, rpc::error::PrettyError}; +use snops_common::{impl_into_status_code, impl_serialize_pretty_error, rpc::error::PrettyError}; use strum_macros::AsRefStr; use thiserror::Error; use url::Url; diff --git a/crates/snot/src/schema/infrastructure.rs b/crates/snops/src/schema/infrastructure.rs similarity index 100% rename from crates/snot/src/schema/infrastructure.rs rename to crates/snops/src/schema/infrastructure.rs diff --git a/crates/snot/src/schema/mod.rs b/crates/snops/src/schema/mod.rs similarity index 99% rename from crates/snot/src/schema/mod.rs rename to crates/snops/src/schema/mod.rs index 6bb9b676..36b743f7 100644 --- a/crates/snot/src/schema/mod.rs +++ b/crates/snops/src/schema/mod.rs @@ -7,7 +7,7 @@ use serde::{ ser::SerializeSeq, Deserialize, Serialize, }; -use snot_common::state::{NodeKey, NodeType}; +use snops_common::state::{NodeKey, NodeType}; use wildmatch::WildMatch; use self::error::{NodeTargetError, SchemaError}; diff --git a/crates/snot/src/schema/nodes.rs b/crates/snops/src/schema/nodes.rs similarity index 99% rename from crates/snot/src/schema/nodes.rs rename to crates/snops/src/schema/nodes.rs index c0af5965..8ca5c534 100644 --- a/crates/snot/src/schema/nodes.rs +++ b/crates/snops/src/schema/nodes.rs @@ -4,7 +4,7 @@ use fixedbitset::FixedBitSet; use indexmap::IndexMap; use lazy_static::lazy_static; use serde::{de::Visitor, Deserialize, Deserializer, Serialize}; -use snot_common::{ +use snops_common::{ lasso::Spur, set::{MaskBit, MASK_PREFIX_LEN}, state::{AgentId, DocHeightRequest, KeyState, NodeState, NodeType}, diff --git a/crates/snot/src/schema/outcomes.rs b/crates/snops/src/schema/outcomes.rs similarity index 100% rename from crates/snot/src/schema/outcomes.rs rename to crates/snops/src/schema/outcomes.rs diff --git a/crates/snot/src/schema/storage.rs b/crates/snops/src/schema/storage.rs similarity index 99% rename from crates/snot/src/schema/storage.rs rename to crates/snops/src/schema/storage.rs index 6256b9d5..f0091aa6 100644 --- a/crates/snot/src/schema/storage.rs +++ b/crates/snops/src/schema/storage.rs @@ -14,7 +14,7 @@ use serde::{ de::{DeserializeOwned, Visitor}, Deserialize, Deserializer, Serialize, }; -use snot_common::state::KeyState; +use snops_common::state::KeyState; use tokio::process::Command; use tracing::{error, warn}; diff --git a/crates/snot/src/schema/timeline.rs b/crates/snops/src/schema/timeline.rs similarity index 99% rename from crates/snot/src/schema/timeline.rs rename to crates/snops/src/schema/timeline.rs index 6e15e2b0..ff4f945b 100644 --- a/crates/snot/src/schema/timeline.rs +++ b/crates/snops/src/schema/timeline.rs @@ -5,7 +5,7 @@ use serde::{ de::{Error, Visitor}, Deserialize, Deserializer, }; -use snot_common::state::NodeKey; +use snops_common::state::NodeKey; use super::NodeTargets; diff --git a/crates/snot/src/server/api.rs b/crates/snops/src/server/api.rs similarity index 99% rename from crates/snot/src/server/api.rs rename to crates/snops/src/server/api.rs index d93f4ff0..c2c1d585 100644 --- a/crates/snot/src/server/api.rs +++ b/crates/snops/src/server/api.rs @@ -7,7 +7,7 @@ use axum::{ }; use serde::Deserialize; use serde_json::json; -use snot_common::{ +use snops_common::{ api::StorageInfoResponse, rpc::agent::AgentMetric, state::{AgentId, EnvId}, diff --git a/crates/snot/src/server/content.rs b/crates/snops/src/server/content.rs similarity index 100% rename from crates/snot/src/server/content.rs rename to crates/snops/src/server/content.rs diff --git a/crates/snot/src/server/error.rs b/crates/snops/src/server/error.rs similarity index 97% rename from crates/snot/src/server/error.rs rename to crates/snops/src/server/error.rs index 5dd4d3e3..389843d9 100644 --- a/crates/snot/src/server/error.rs +++ b/crates/snops/src/server/error.rs @@ -2,7 +2,7 @@ use axum::{response::IntoResponse, Json}; use http::StatusCode; use serde::{ser::SerializeStruct, Serialize, Serializer}; use serde_json::json; -use snot_common::{impl_into_status_code, state::AgentId}; +use snops_common::{impl_into_status_code, state::AgentId}; use thiserror::Error; use crate::{ diff --git a/crates/snot/src/server/jwt.rs b/crates/snops/src/server/jwt.rs similarity index 94% rename from crates/snot/src/server/jwt.rs rename to crates/snops/src/server/jwt.rs index 4ec124f0..56ba5b6c 100644 --- a/crates/snot/src/server/jwt.rs +++ b/crates/snops/src/server/jwt.rs @@ -4,7 +4,7 @@ use rand::{Rng, SeedableRng}; use rand_chacha::ChaChaRng; use serde::{Deserialize, Serialize}; use sha2::Sha256; -use snot_common::state::AgentId; +use snops_common::state::AgentId; lazy_static! { pub static ref JWT_NONCE: u16 = ChaChaRng::from_entropy().gen(); diff --git a/crates/snot/src/server/mod.rs b/crates/snops/src/server/mod.rs similarity index 99% rename from crates/snot/src/server/mod.rs rename to crates/snops/src/server/mod.rs index 79859757..bde05da8 100644 --- a/crates/snot/src/server/mod.rs +++ b/crates/snops/src/server/mod.rs @@ -14,7 +14,7 @@ use axum::{ }; use futures_util::stream::StreamExt; use serde::Deserialize; -use snot_common::{ +use snops_common::{ prelude::*, rpc::{agent::AgentServiceClient, control::ControlService}, }; diff --git a/crates/snot/src/server/rpc.rs b/crates/snops/src/server/rpc.rs similarity index 98% rename from crates/snot/src/server/rpc.rs rename to crates/snops/src/server/rpc.rs index 727bf3ed..8f35aa21 100644 --- a/crates/snot/src/server/rpc.rs +++ b/crates/snops/src/server/rpc.rs @@ -3,7 +3,7 @@ use std::{ net::IpAddr, }; -use snot_common::{ +use snops_common::{ rpc::{ agent::{AgentServiceRequest, AgentServiceResponse}, control::{ControlService, ControlServiceRequest, ControlServiceResponse}, diff --git a/crates/snot/src/state.rs b/crates/snops/src/state.rs similarity index 99% rename from crates/snot/src/state.rs rename to crates/snops/src/state.rs index 4083edc8..8fa987b0 100644 --- a/crates/snot/src/state.rs +++ b/crates/snops/src/state.rs @@ -9,7 +9,7 @@ use bimap::BiMap; use fixedbitset::FixedBitSet; use jwt::SignWithKey; use serde::Deserialize; -use snot_common::{ +use snops_common::{ lasso::Spur, rpc::{agent::AgentServiceClient, error::ReconcileError}, set::{MaskBit, MASK_PREFIX_LEN}, diff --git a/scripts/agent.sh b/scripts/agent.sh index 5c30f714..31f9cf21 100755 --- a/scripts/agent.sh +++ b/scripts/agent.sh @@ -11,10 +11,10 @@ if [ -z "$INDEX" ]; then exit 1 fi -DATA_PATH="$(pwd)/snot-data/$INDEX" +DATA_PATH="$(pwd)/snops-data/$INDEX" echo "Starting ${DATA_PATH}" -cargo run --release -p snot-agent -- \ +cargo run --release -p snops-agent -- \ --id "local-$INDEX" \ --path "$DATA_PATH" \ --bind "0.0.0.0" \ diff --git a/scripts/control_plane.sh b/scripts/control_plane.sh index ba6e8bc7..0a8c6b93 100755 --- a/scripts/control_plane.sh +++ b/scripts/control_plane.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -cargo run -p snot +cargo run -p snops