diff --git a/radicle-cob/src/change_graph.rs b/radicle-cob/src/change_graph.rs index 9045ebbc..525fc256 100644 --- a/radicle-cob/src/change_graph.rs +++ b/radicle-cob/src/change_graph.rs @@ -7,8 +7,8 @@ use git_ext::Oid; use radicle_dag::Dag; use crate::{ - change, history::EntryId, object, signatures::ExtendedSignature, CollaborativeObject, Entry, - History, ObjectId, TypeName, + change, object, signatures::ExtendedSignature, CollaborativeObject, Entry, History, ObjectId, + TypeName, }; /// The graph of changes for a particular collaborative object @@ -102,10 +102,10 @@ impl ChangeGraph { graph.node(id, entry); for k in &change.dependents { - graph.dependency(EntryId::from(*k), id); + graph.dependency(*k, id); } for k in &change.dependencies { - graph.dependency(id, EntryId::from(*k)); + graph.dependency(id, *k); } ControlFlow::Continue(graph) }); diff --git a/radicle/src/cob/store.rs b/radicle/src/cob/store.rs index 5a593e64..50025c5a 100644 --- a/radicle/src/cob/store.rs +++ b/radicle/src/cob/store.rs @@ -367,7 +367,7 @@ impl Transaction { object, parents, } = store.update(id, msg, actions.clone(), self.embeds, signer)?; - let id = EntryId::from(head); + let id = head; let author = self.actor; let timestamp = Timestamp::from_secs(object.history().timestamp()); let identity = store.identity;