mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Rename `repo_entries` to `repo_policies` 

Do the same thing for `node_entries` etc.
This commit is contained in:
Alexis Sellier 2023-03-15 11:28:26 +01:00
parent 9b6ede8fc5
commit b558c742e6
No known key found for this signature in database
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
radicle-cli/src/commands/node/tracking.rs
View File

@ -17,7 +17,7 @@ fn print_repos(store: &tracking::store::Config) -> anyhow::Result<()> {
let mut t = term::Table::new(term::table::TableOptions::default()); let mut t = term::Table::new(term::table::TableOptions::default());
t.push(["RID", "Scope", "Policy"]); t.push(["RID", "Scope", "Policy"]);
t.push(["---", "-----", "------"]); t.push(["---", "-----", "------"]);
for tracking::Repo { id, scope, policy } in store.repo_entries()? { for tracking::Repo { id, scope, policy } in store.repo_policies()? {
t.push([ t.push([
term::format::highlight(id.to_string()), term::format::highlight(id.to_string()),
term::format::secondary(scope.to_string()), term::format::secondary(scope.to_string()),
@ -32,7 +32,7 @@ fn print_nodes(store: &tracking::store::Config) -> anyhow::Result<()> {
let mut t = term::Table::new(term::table::TableOptions::default()); let mut t = term::Table::new(term::table::TableOptions::default());
t.push(["DID", "Alias", "Policy"]); t.push(["DID", "Alias", "Policy"]);
t.push(["---", "-----", "------"]); t.push(["---", "-----", "------"]);
for tracking::Node { id, alias, policy } in store.node_entries()? { for tracking::Node { id, alias, policy } in store.node_policies()? {
t.push([ t.push([
term::format::highlight(Did::from(id).to_string()), term::format::highlight(Did::from(id).to_string()),
match alias { match alias {

6
radicle-node/src/service.rs
View File

@ -292,7 +292,7 @@ where
// TODO: Share this code with initialization code. // TODO: Share this code with initialization code.
self.filter = Filter::new( self.filter = Filter::new(
self.tracking self.tracking
.repo_entries()? .repo_policies()?
.filter_map(|t| (t.policy == tracking::Policy::Track).then_some(t.id)), .filter_map(|t| (t.policy == tracking::Policy::Track).then_some(t.id)),
); );
Ok(updated) Ok(updated)
@ -382,7 +382,7 @@ where
// Setup subscription filter for tracked repos. // Setup subscription filter for tracked repos.
self.filter = Filter::new( self.filter = Filter::new(
self.tracking self.tracking
.repo_entries()? .repo_policies()?
.filter_map(|t| (t.policy == tracking::Policy::Track).then_some(t.id)), .filter_map(|t| (t.policy == tracking::Policy::Track).then_some(t.id)),
); );
@ -1415,7 +1415,7 @@ where
let inventory = self.storage().inventory()?; let inventory = self.storage().inventory()?;
let missing = self let missing = self
.tracking .tracking
.repo_entries()? .repo_policies()?
.filter_map(|t| (t.policy == tracking::Policy::Track).then_some(t.id)) .filter_map(|t| (t.policy == tracking::Policy::Track).then_some(t.id))
.filter(|rid| !inventory.contains(rid)); .filter(|rid| !inventory.contains(rid));

6
radicle-node/src/service/tracking.rs
View File

@ -77,7 +77,7 @@ impl Config {
/// Get a node's tracking information. /// Get a node's tracking information.
/// Returns the default policy if the node isn't found. /// Returns the default policy if the node isn't found.
pub fn node_policy(&self, id: &NodeId) -> Result<Node, Error> { pub fn node_policy(&self, id: &NodeId) -> Result<Node, Error> {
Ok(self.store.node_entry(id)?.unwrap_or(Node { Ok(self.store.node_policy(id)?.unwrap_or(Node {
id: *id, id: *id,
alias: None, alias: None,
policy: self.policy, policy: self.policy,
@ -87,7 +87,7 @@ impl Config {
/// Get a repository's tracking information. /// Get a repository's tracking information.
/// Returns the default policy if the repo isn't found. /// Returns the default policy if the repo isn't found.
pub fn repo_policy(&self, id: &Id) -> Result<Repo, Error> { pub fn repo_policy(&self, id: &Id) -> Result<Repo, Error> {
Ok(self.store.repo_entry(id)?.unwrap_or(Repo { Ok(self.store.repo_policy(id)?.unwrap_or(Repo {
id: *id, id: *id,
scope: self.scope, scope: self.scope,
policy: self.policy, policy: self.policy,
@ -112,7 +112,7 @@ impl Config {
Scope::All => Ok(Namespaces::All), Scope::All => Ok(Namespaces::All),
Scope::Trusted => { Scope::Trusted => {
let nodes = self let nodes = self
.node_entries() .node_policies()
.map_err(|err| FailedNodes { rid: *rid, err })?; .map_err(|err| FailedNodes { rid: *rid, err })?;
let mut trusted: Vec<_> = nodes let mut trusted: Vec<_> = nodes
.filter_map(|node| (node.policy == Policy::Track).then_some(node.id)) .filter_map(|node| (node.policy == Policy::Track).then_some(node.id))

46
radicle/src/node/tracking/store.rs
View File

@ -141,7 +141,7 @@ impl Config {
/// Check if a node is tracked. /// Check if a node is tracked.
pub fn is_node_tracked(&self, id: &NodeId) -> Result<bool, Error> { pub fn is_node_tracked(&self, id: &NodeId) -> Result<bool, Error> {
Ok(matches!( Ok(matches!(
self.node_entry(id)?, self.node_policy(id)?,
Some(Node { Some(Node {
policy: Policy::Track, policy: Policy::Track,
.. ..
@ -152,7 +152,7 @@ impl Config {
/// Check if a repository is tracked. /// Check if a repository is tracked.
pub fn is_repo_tracked(&self, id: &Id) -> Result<bool, Error> { pub fn is_repo_tracked(&self, id: &Id) -> Result<bool, Error> {
Ok(matches!( Ok(matches!(
self.repo_entry(id)?, self.repo_policy(id)?,
Some(Repo { Some(Repo {
policy: Policy::Track, policy: Policy::Track,
.. ..
@ -160,8 +160,8 @@ impl Config {
)) ))
} }
/// Get a node's tracking information. /// Get a node's tracking policy.
pub fn node_entry(&self, id: &NodeId) -> Result<Option<Node>, Error> { pub fn node_policy(&self, id: &NodeId) -> Result<Option<Node>, Error> {
let mut stmt = self let mut stmt = self
.db .db
.prepare("SELECT alias, policy FROM `node-policies` WHERE id = ?")?; .prepare("SELECT alias, policy FROM `node-policies` WHERE id = ?")?;
@ -182,8 +182,8 @@ impl Config {
Ok(None) Ok(None)
} }
/// Get a repository's tracking information. /// Get a repository's tracking policy.
pub fn repo_entry(&self, id: &Id) -> Result<Option<Repo>, Error> { pub fn repo_policy(&self, id: &Id) -> Result<Option<Repo>, Error> {
let mut stmt = self let mut stmt = self
.db .db
.prepare("SELECT scope, policy FROM `repo-policies` WHERE id = ?")?; .prepare("SELECT scope, policy FROM `repo-policies` WHERE id = ?")?;
@ -200,8 +200,8 @@ impl Config {
Ok(None) Ok(None)
} }
/// Get node tracking entries. /// Get node tracking policies.
pub fn node_entries(&self) -> Result<Box<dyn Iterator<Item = Node>>, Error> { pub fn node_policies(&self) -> Result<Box<dyn Iterator<Item = Node>>, Error> {
let mut stmt = self let mut stmt = self
.db .db
.prepare("SELECT id, alias, policy FROM `node-policies`")? .prepare("SELECT id, alias, policy FROM `node-policies`")?
@ -220,8 +220,8 @@ impl Config {
} }
// TODO: see if sql can return iterator directly // TODO: see if sql can return iterator directly
/// Get repository tracking entries. /// Get repository tracking policies.
pub fn repo_entries(&self) -> Result<Box<dyn Iterator<Item = Repo>>, Error> { pub fn repo_policies(&self) -> Result<Box<dyn Iterator<Item = Repo>>, Error> {
let mut stmt = self let mut stmt = self
.db .db
.prepare("SELECT id, scope, policy FROM `repo-policies`")? .prepare("SELECT id, scope, policy FROM `repo-policies`")?
@ -271,28 +271,28 @@ mod test {
} }
#[test] #[test]
fn test_node_entries() { fn test_node_policies() {
let ids = arbitrary::vec::<NodeId>(3); let ids = arbitrary::vec::<NodeId>(3);
let mut db = Config::open(":memory:").unwrap(); let mut db = Config::open(":memory:").unwrap();
for id in &ids { for id in &ids {
assert!(db.track_node(id, None).unwrap()); assert!(db.track_node(id, None).unwrap());
} }
let mut entries = db.node_entries().unwrap(); let mut entries = db.node_policies().unwrap();
assert_matches!(entries.next(), Some(Node { id, .. }) if id == ids[0]); assert_matches!(entries.next(), Some(Node { id, .. }) if id == ids[0]);
assert_matches!(entries.next(), Some(Node { id, .. }) if id == ids[1]); assert_matches!(entries.next(), Some(Node { id, .. }) if id == ids[1]);
assert_matches!(entries.next(), Some(Node { id, .. }) if id == ids[2]); assert_matches!(entries.next(), Some(Node { id, .. }) if id == ids[2]);
} }
#[test] #[test]
fn test_repo_entries() { fn test_repo_policies() {
let ids = arbitrary::vec::<Id>(3); let ids = arbitrary::vec::<Id>(3);
let mut db = Config::open(":memory:").unwrap(); let mut db = Config::open(":memory:").unwrap();
for id in &ids { for id in &ids {
assert!(db.track_repo(id, Scope::All).unwrap()); assert!(db.track_repo(id, Scope::All).unwrap());
} }
let mut entries = db.repo_entries().unwrap(); let mut entries = db.repo_policies().unwrap();
assert_matches!(entries.next(), Some(Repo { id, .. }) if id == ids[0]); assert_matches!(entries.next(), Some(Repo { id, .. }) if id == ids[0]);
assert_matches!(entries.next(), Some(Repo { id, .. }) if id == ids[1]); assert_matches!(entries.next(), Some(Repo { id, .. }) if id == ids[1]);
assert_matches!(entries.next(), Some(Repo { id, .. }) if id == ids[2]); assert_matches!(entries.next(), Some(Repo { id, .. }) if id == ids[2]);
@ -305,15 +305,15 @@ mod test {
assert!(db.track_node(&id, Some("eve")).unwrap()); assert!(db.track_node(&id, Some("eve")).unwrap());
assert_eq!( assert_eq!(
db.node_entry(&id).unwrap().unwrap().alias, db.node_policy(&id).unwrap().unwrap().alias,
Some(String::from("eve")) Some(String::from("eve"))
); );
assert!(db.track_node(&id, None).unwrap()); assert!(db.track_node(&id, None).unwrap());
assert_eq!(db.node_entry(&id).unwrap().unwrap().alias, None); assert_eq!(db.node_policy(&id).unwrap().unwrap().alias, None);
assert!(!db.track_node(&id, None).unwrap()); assert!(!db.track_node(&id, None).unwrap());
assert!(db.track_node(&id, Some("alice")).unwrap()); assert!(db.track_node(&id, Some("alice")).unwrap());
assert_eq!( assert_eq!(
db.node_entry(&id).unwrap().unwrap().alias, db.node_policy(&id).unwrap().unwrap().alias,
Some(String::from("alice")) Some(String::from("alice"))
); );
} }
@ -324,9 +324,9 @@ mod test {
let mut db = Config::open(":memory:").unwrap(); let mut db = Config::open(":memory:").unwrap();
assert!(db.track_repo(&id, Scope::All).unwrap()); assert!(db.track_repo(&id, Scope::All).unwrap());
assert_eq!(db.repo_entry(&id).unwrap().unwrap().scope, Scope::All); assert_eq!(db.repo_policy(&id).unwrap().unwrap().scope, Scope::All);
assert!(db.track_repo(&id, Scope::Trusted).unwrap()); assert!(db.track_repo(&id, Scope::Trusted).unwrap());
assert_eq!(db.repo_entry(&id).unwrap().unwrap().scope, Scope::Trusted); assert_eq!(db.repo_policy(&id).unwrap().unwrap().scope, Scope::Trusted);
} }
#[test] #[test]
@ -335,9 +335,9 @@ mod test {
let mut db = Config::open(":memory:").unwrap(); let mut db = Config::open(":memory:").unwrap();
assert!(db.track_repo(&id, Scope::All).unwrap()); assert!(db.track_repo(&id, Scope::All).unwrap());
assert_eq!(db.repo_entry(&id).unwrap().unwrap().policy, Policy::Track); assert_eq!(db.repo_policy(&id).unwrap().unwrap().policy, Policy::Track);
assert!(db.set_repo_policy(&id, Policy::Block).unwrap()); assert!(db.set_repo_policy(&id, Policy::Block).unwrap());
assert_eq!(db.repo_entry(&id).unwrap().unwrap().policy, Policy::Block); assert_eq!(db.repo_policy(&id).unwrap().unwrap().policy, Policy::Block);
} }
#[test] #[test]
@ -346,8 +346,8 @@ mod test {
let mut db = Config::open(":memory:").unwrap(); let mut db = Config::open(":memory:").unwrap();
assert!(db.track_node(&id, None).unwrap()); assert!(db.track_node(&id, None).unwrap());
assert_eq!(db.node_entry(&id).unwrap().unwrap().policy, Policy::Track); assert_eq!(db.node_policy(&id).unwrap().unwrap().policy, Policy::Track);
assert!(db.set_node_policy(&id, Policy::Block).unwrap()); assert!(db.set_node_policy(&id, Policy::Block).unwrap());
assert_eq!(db.node_entry(&id).unwrap().unwrap().policy, Policy::Block); assert_eq!(db.node_policy(&id).unwrap().unwrap().policy, Policy::Block);
} }
} }