github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

made match statement more succinct by ignoring none value

Browse Source
This commit is contained in:
rachel-rose
2021-06-27 07:58:42 +02:00
parent f7e6700e8c
commit e6d76428d1
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/crypto/merkle.rs
View File

@@ -168,28 +168,16 @@ impl<Node: Hashable> CommitmentTree<Node> {
impl<Node: Hashable> Encodable for CommitmentTree<Node> {
fn encode<S: io::Write>(&self, mut s: S) -> Result<usize> {
let mut len = 0;
match self.left {
Some(v) => {
if let Some(v) = self.left {
len += v.encode(&mut s)?;
}
if let Some(v) = self.right {
len += v.encode(&mut s)?;
}
for parent in self.parents.iter() {
if let Some(v) = parent {
len += v.encode(&mut s)?;
1
}
None => 0,
};
match self.right {
Some(v) => {
len += v.encode(&mut s)?;
1
}
None => 0,
};
for c in self.parents.iter() {
match c {
Some(v) => {
len += v.encode(&mut s)?;
1
}
None => 0,
};
}
Ok(len)
}
@@ -258,13 +246,9 @@ impl<Node: Hashable> Encodable for IncrementalWitness<Node> {
len += c.encode(&mut s)?;
}
len += self.cursor_depth.encode(&mut s)?;
match &self.cursor {
Some(v) => {
len += v.encode(&mut s)?;
1
}
None => 0,
};
if let Some(v) = self.cursor {
len += v.encode(&mut s)?;
}
Ok(len)
}
}