From 46ee08aaf3d3e0c6e8edfc7fb643aa44eebfc48f Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Wed, 7 Sep 2022 13:57:50 +0200 Subject: [PATCH] node: Rename "user" In some cases to "public key" and in other cases to "remote". Signed-off-by: Alexis Sellier --- node/src/protocol.rs | 2 +- node/src/rad.rs | 20 ++++++++++---------- node/src/storage.rs | 20 ++++++++++++-------- node/src/storage/git.rs | 6 +++--- node/src/test/fixtures.rs | 2 +- node/src/test/storage.rs | 14 +++++++------- 6 files changed, 34 insertions(+), 30 deletions(-) diff --git a/node/src/protocol.rs b/node/src/protocol.rs index 682a4e29..78bf53d2 100644 --- a/node/src/protocol.rs +++ b/node/src/protocol.rs @@ -431,7 +431,7 @@ where resp.send(self.untrack(proj)).ok(); } Command::AnnounceRefsUpdate(proj) => { - let user = *self.storage.user_id(); + let user = *self.storage.public_key(); let repo = self.storage.repository(&proj).unwrap(); let remote = repo.remote(&user).unwrap(); let peers = self.peers.negotiated().map(|(_, p)| p.addr); diff --git a/node/src/rad.rs b/node/src/rad.rs index 28132e5f..734fcbda 100644 --- a/node/src/rad.rs +++ b/node/src/rad.rs @@ -40,11 +40,11 @@ pub fn init<'r, S: storage::WriteStorage<'r>>( default_branch: BranchName, storage: S, ) -> Result<(ProjId, SignedRefs), InitError> { - let user_id = storage.user_id(); + let pk = storage.public_key(); let delegate = identity::Delegate { // TODO: Use actual user name. name: String::from("anonymous"), - id: identity::Did::from(*user_id), + id: identity::Did::from(*pk), }; let doc = identity::Doc { name: name.to_owned(), @@ -81,24 +81,24 @@ pub fn init<'r, S: storage::WriteStorage<'r>>( }?; let sig = repo .signature() - .or_else(|_| git2::Signature::now("radicle", user_id.to_string().as_str()))?; + .or_else(|_| git2::Signature::now("radicle", pk.to_string().as_str()))?; - let id_ref = format!("refs/remotes/{user_id}/{}", &*RADICLE_ID_REF); + let id_ref = format!("refs/remotes/{pk}/{}", &*RADICLE_ID_REF); let _oid = repo.commit(Some(&id_ref), &sig, &sig, "Initialize Radicle", &tree, &[])?; } git::set_upstream( repo, REMOTE_NAME, &default_branch, - &format!("refs/remotes/{user_id}/heads/{default_branch}"), + &format!("refs/remotes/{pk}/heads/{default_branch}"), )?; // TODO: Note that you'll likely want to use `RemoteCallbacks` and set // `push_update_reference` to test whether all the references were pushed // successfully. - git::configure_remote(repo, REMOTE_NAME, user_id, project.path())?.push::<&str>( + git::configure_remote(repo, REMOTE_NAME, pk, project.path())?.push::<&str>( &[&format!( - "refs/heads/{default_branch}:refs/remotes/{user_id}/heads/{default_branch}" + "refs/heads/{default_branch}:refs/remotes/{pk}/heads/{default_branch}" )], None, )?; @@ -132,7 +132,7 @@ pub fn checkout, S: storage::ReadStorage>( opts.no_reinit(true).description(&project.doc.description); let repo = git2::Repository::init_opts(path, &opts)?; - let remote_id = storage.user_id(); + let remote_id = storage.public_key(); let default_branch = project.doc.default_branch.as_str(); // Configure and fetch all refs from remote. @@ -184,7 +184,7 @@ mod tests { let project = storage.get(&id).unwrap().unwrap(); - assert_eq!(project.remotes[storage.user_id()].refs, refs); + assert_eq!(project.remotes[storage.public_key()].refs, refs); assert_eq!(project.id, id); assert_eq!(project.doc.name, "acme"); assert_eq!(project.doc.description, "Acme's repo"); @@ -193,7 +193,7 @@ mod tests { project.doc.delegates.first(), &Delegate { name: String::from("anonymous"), - id: Did::from(*storage.user_id()), + id: Did::from(*storage.public_key()), } ); } diff --git a/node/src/storage.rs b/node/src/storage.rs index ee0aabeb..eda4bca7 100644 --- a/node/src/storage.rs +++ b/node/src/storage.rs @@ -14,7 +14,7 @@ use thiserror::Error; pub use radicle_git_ext::Oid; use crate::collections::HashMap; -use crate::crypto::{self, Unverified, Verified}; +use crate::crypto::{self, PublicKey, Unverified, Verified}; use crate::git::Url; use crate::git::{RefError, RefStr}; use crate::identity; @@ -159,7 +159,7 @@ impl Remote { } pub trait ReadStorage { - fn user_id(&self) -> &UserId; + fn public_key(&self) -> &PublicKey; fn url(&self) -> Url; fn get(&self, proj: &ProjId) -> Result, Error>; fn inventory(&self) -> Result; @@ -180,12 +180,16 @@ pub trait ReadRepository<'r> { fn blob_at<'a>(&'a self, oid: Oid, path: &'a Path) -> Result, git_ext::Error>; fn reference( &self, - user: &UserId, + remote: &RemoteId, reference: &RefStr, ) -> Result, git2::Error>; - fn reference_oid(&self, user: &UserId, reference: &RefStr) -> Result, git2::Error>; - fn references(&self, user: &UserId) -> Result; - fn remote(&self, user: &UserId) -> Result, refs::Error>; + fn reference_oid( + &self, + remote: &RemoteId, + reference: &RefStr, + ) -> Result, git2::Error>; + fn references(&self, remote: &RemoteId) -> Result; + fn remote(&self, remote: &RemoteId) -> Result, refs::Error>; fn remotes(&'r self) -> Result; } @@ -199,8 +203,8 @@ where T: Deref, S: ReadStorage + 'static, { - fn user_id(&self) -> &UserId { - self.deref().user_id() + fn public_key(&self) -> &UserId { + self.deref().public_key() } fn url(&self) -> Url { diff --git a/node/src/storage/git.rs b/node/src/storage/git.rs index 42b7dc85..ef759ef7 100644 --- a/node/src/storage/git.rs +++ b/node/src/storage/git.rs @@ -38,7 +38,7 @@ impl fmt::Debug for Storage { } impl ReadStorage for Storage { - fn user_id(&self) -> &UserId { + fn public_key(&self) -> &UserId { self.signer.public_key() } @@ -53,7 +53,7 @@ impl ReadStorage for Storage { fn get(&self, id: &ProjId) -> Result, Error> { // TODO: Don't create a repo here if it doesn't exist? // Perhaps for checking we could have a `contains` method? - let local = self.user_id(); + let local = self.public_key(); let repo = self.repository(id)?; if let Some(doc) = repo.identity(local)? { @@ -424,7 +424,7 @@ mod tests { let signer = MockSigner::new(&mut rng); let storage = Storage::open(tmp.path(), signer).unwrap(); let proj_id = arbitrary::gen::(1); - let alice = *storage.user_id(); + let alice = *storage.public_key(); let project = storage.repository(&proj_id).unwrap(); let backend = &project.backend; let sig = git2::Signature::now(&alice.to_string(), "anonymous@radicle.xyz").unwrap(); diff --git a/node/src/test/fixtures.rs b/node/src/test/fixtures.rs index 33243060..6b5b26d9 100644 --- a/node/src/test/fixtures.rs +++ b/node/src/test/fixtures.rs @@ -19,7 +19,7 @@ pub fn storage>(path: P) -> Storage { crate::test::logger::init(log::Level::Debug); for storage in &storages { - let remote = storage.user_id(); + let remote = storage.public_key(); log::debug!("signer {}...", remote); diff --git a/node/src/test/storage.rs b/node/src/test/storage.rs index 96e16131..1aadb05b 100644 --- a/node/src/test/storage.rs +++ b/node/src/test/storage.rs @@ -1,8 +1,8 @@ use git_url::Url; -use crate::crypto::Verified; +use crate::crypto::{PublicKey, Verified}; use crate::git; -use crate::identity::{ProjId, Project, UserId}; +use crate::identity::{ProjId, Project}; use crate::storage::refs; use crate::storage::{ Error, Inventory, ReadRepository, ReadStorage, Remote, RemoteId, WriteRepository, WriteStorage, @@ -26,7 +26,7 @@ impl MockStorage { } impl ReadStorage for MockStorage { - fn user_id(&self) -> &UserId { + fn public_key(&self) -> &PublicKey { todo!() } @@ -84,7 +84,7 @@ impl ReadRepository<'_> for MockRepository { todo!() } - fn remote(&self, _user: &UserId) -> Result, refs::Error> { + fn remote(&self, _remote: &RemoteId) -> Result, refs::Error> { todo!() } @@ -102,7 +102,7 @@ impl ReadRepository<'_> for MockRepository { fn reference( &self, - _user: &UserId, + _remote: &RemoteId, _reference: &git::RefStr, ) -> Result, git2::Error> { todo!() @@ -110,13 +110,13 @@ impl ReadRepository<'_> for MockRepository { fn reference_oid( &self, - _user: &UserId, + _remote: &RemoteId, _reference: &git::RefStr, ) -> Result, git2::Error> { todo!() } - fn references(&self, _user: &UserId) -> Result { + fn references(&self, _remote: &RemoteId) -> Result { todo!() } }