diff --git a/radicle-httpd/src/api.rs b/radicle-httpd/src/api.rs index dcf3200f1..15c5a2cd6 100644 --- a/radicle-httpd/src/api.rs +++ b/radicle-httpd/src/api.rs @@ -18,8 +18,8 @@ use tower_http::cors::{self, CorsLayer}; use radicle::cob::{issue, Uri}; use radicle::cob::{patch, Embed}; use radicle::identity::{DocAt, Id}; +use radicle::node::policy::Scope; use radicle::node::routing::Store; -use radicle::node::tracking::Scope; use radicle::node::{Handle, NodeId}; use radicle::storage::{Oid, ReadRepository, ReadStorage}; use radicle::{Node, Profile}; diff --git a/radicle-httpd/src/api/error.rs b/radicle-httpd/src/api/error.rs index b46c868a0..e5c2ac4eb 100644 --- a/radicle-httpd/src/api/error.rs +++ b/radicle-httpd/src/api/error.rs @@ -72,7 +72,7 @@ pub enum Error { /// Tracking store error. #[error(transparent)] - TrackingStore(#[from] radicle::node::tracking::store::Error), + TrackingStore(#[from] radicle::node::policy::store::Error), /// Node database error. #[error(transparent)] diff --git a/radicle-httpd/src/api/v1/node.rs b/radicle-httpd/src/api/v1/node.rs index f1e479440..c9f5c1ecb 100644 --- a/radicle-httpd/src/api/v1/node.rs +++ b/radicle-httpd/src/api/v1/node.rs @@ -7,7 +7,7 @@ use hyper::StatusCode; use serde_json::json; use radicle::identity::Id; -use radicle::node::{tracking, Handle, DEFAULT_TIMEOUT}; +use radicle::node::{policy, Handle, DEFAULT_TIMEOUT}; use radicle::Node; use crate::api::error::Error; @@ -20,7 +20,7 @@ pub fn router(ctx: Context) -> Router { .route("/node/policies/repos", get(node_policies_repos_handler)) .route( "/node/policies/repos/:rid", - put(node_policies_track_handler).delete(node_policies_untrack_handler), + put(node_policies_seed_handler).delete(node_policies_unseed_handler), ) .with_state(ctx) } @@ -57,7 +57,7 @@ async fn node_policies_repos_handler(State(ctx): State) -> impl IntoRes let tracking = ctx.profile.tracking()?; let mut repos = Vec::new(); - for tracking::Repo { id, scope, policy } in tracking.repo_policies()? { + for policy::Repo { id, scope, policy } in tracking.repo_policies()? { repos.push(json!({ "id": id, "scope": scope, @@ -70,7 +70,7 @@ async fn node_policies_repos_handler(State(ctx): State) -> impl IntoRes /// Track a new repo. /// `PUT /node/policies/repos/:rid` -async fn node_policies_track_handler( +async fn node_policies_seed_handler( State(ctx): State, AuthBearer(token): AuthBearer, Path(project): Path, @@ -78,7 +78,8 @@ async fn node_policies_track_handler( ) -> impl IntoResponse { api::auth::validate(&ctx, &token).await?; let mut node = Node::new(ctx.profile.socket()); - node.track_repo(project, qs.scope.unwrap_or_default())?; + node.seed(project, qs.scope.unwrap_or_default())?; + if let Some(from) = qs.from { let results = node.fetch(project, from, DEFAULT_TIMEOUT)?; return Ok::<_, Error>(( @@ -86,20 +87,19 @@ async fn node_policies_track_handler( Json(json!({ "success": true, "results": results })), )); } - Ok::<_, Error>((StatusCode::OK, Json(json!({ "success": true })))) } /// Untrack a repo. /// `DELETE /node/policies/repos/:rid` -async fn node_policies_untrack_handler( +async fn node_policies_unseed_handler( State(ctx): State, AuthBearer(token): AuthBearer, Path(project): Path, ) -> impl IntoResponse { api::auth::validate(&ctx, &token).await?; let mut node = Node::new(ctx.profile.socket()); - node.untrack_repo(project)?; + node.unseed(project)?; Ok::<_, Error>((StatusCode::OK, Json(json!({ "success": true })))) }