Adding parents and children helper APIs to MerkleReg #116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidrusu
reviewed
Mar 17, 2021
src/merkle_reg.rs
Outdated
| use quickcheck::{Arbitrary, Gen}; | ||
| use serde::{Deserialize, Serialize}; | ||
| use std::collections::{BTreeMap, BTreeSet}; |
There was a problem hiding this comment.
please keep the std/core imports up in the first group of imports, third party imports in the second group and local crate imports in the third group
src/merkle_reg.rs
Outdated
| @@ -11,7 +11,7 @@ use crate::traits::{CmRDT, CvRDT}; | |||
| pub type Hash = [u8; 32]; | |||
|
|
|||
| /// A node in the Merkle DAG | |||
| #[derive(Debug, Clone, PartialEq, Eq)] | |||
| #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, PartialOrd, Deserialize)] | |||
There was a problem hiding this comment.
If you're going to derive PartialOrd, might as well get Ord as well. Also keep the serde(or any third party) derives together at the end.
Suggested change
| #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, PartialOrd, Deserialize)] | |
| #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] |
| @@ -57,7 +57,7 @@ impl<'a, T> Content<'a, T> { | |||
|
|
|||
| /// Iterate over the Merkle DAG nodes holding the content values. | |||
| pub fn nodes(&self) -> impl Iterator<Item = &Node<T>> { | |||
| self.nodes.values().map(|n| *n) | |||
| self.nodes.values().copied() | |||
src/merkle_reg.rs
Outdated
| @@ -74,7 +74,7 @@ impl<'a, T> Content<'a, T> { | |||
| /// The MerkleReg is a Register CRDT that uses the Merkle DAG | |||
| /// structure to track the current value(s) held by this register. | |||
| /// The leaves of the Merkle DAG are the current values. | |||
| #[derive(Debug, PartialEq, Eq, Clone)] | |||
| #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, PartialOrd)] | |||
There was a problem hiding this comment.
Suggested change
| #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, PartialOrd)] | |
| #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] |
src/merkle_reg.rs
Outdated
| node.parents | ||
| .iter() | ||
| .copied() | ||
| .filter_map(|leaf| self.dag.get(&leaf).map(|node| (leaf, node))) |
There was a problem hiding this comment.
Suggested change
| .filter_map(|leaf| self.dag.get(&leaf).map(|node| (leaf, node))) | |
| .filter_map(|parent_hash| self.dag.get(&parent_hash).map(|node| (parent_hash, node))) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.