gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Less clones

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-01-21 10:58:47 -08:00
parent 823252dd41
commit 5d9d83d312
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/fork-selection.rs
View File

@ -85,7 +85,7 @@ pub struct Fork {
impl Fork { impl Fork {
fn is_trunk_of(&self, other: &Fork, fork_tree: &HashMap<usize, Fork>) -> bool { fn is_trunk_of(&self, other: &Fork, fork_tree: &HashMap<usize, Fork>) -> bool {
let mut current = other.clone(); let mut current = other;
loop { loop {
// found it // found it
if current.id == self.id { if current.id == self.id {
@ -100,7 +100,7 @@ impl Fork {
if fork_tree.get(&current.base).is_none() { if fork_tree.get(&current.base).is_none() {
return false; return false;
} }
current = fork_tree.get(&current.base).unwrap().clone(); current = fork_tree.get(&current.base).unwrap();
} }
} }
} }
@ -326,7 +326,7 @@ impl LockTower {
pub fn last_fork(&self) -> Fork { pub fn last_fork(&self) -> Fork {
self.last_vote() self.last_vote()
.map(|v| v.fork.clone()) .map(|v| v.fork.clone())
.unwrap_or(self.fork_trunk.clone()) .unwrap_or_else(|| self.fork_trunk.clone())
} }
} }
@ -520,7 +520,7 @@ fn test_with_partitions(
} }
let vote = Vote::new(fork, time); let vote = Vote::new(fork, time);
assert!(tower.is_valid(&vote, &fork_tree)); assert!(tower.is_valid(&vote, &fork_tree));
assert!(tower.push_vote(vote.clone(), &fork_tree, &bmap)); assert!(tower.push_vote(vote, &fork_tree, &bmap));
} }
} }
for tower in towers.iter_mut() { for tower in towers.iter_mut() {
@ -534,7 +534,7 @@ fn test_with_partitions(
for rounds in 0..10 { for rounds in 0..10 {
for i in 0..len { for i in 0..len {
let time = warmup + rounds * len + i; let time = warmup + rounds * len + i;
let base = towers[i].last_fork().clone(); let base = towers[i].last_fork();
let fork = Fork { let fork = Fork {
id: time + num_partitions, id: time + num_partitions,
base: base.id, base: base.id,