Skip to content

Commit

Permalink
More merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
coderofstuff committed Aug 27, 2024
1 parent bdf205e commit 4c9f997
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions consensus/src/consensus/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ impl ConsensusApi for Consensus {

for child in initial_children {
if visited.insert(child) {
let blue_work = self.ghostdag_primary_store.get_blue_work(child).unwrap();
let blue_work = self.ghostdag_store.get_blue_work(child).unwrap();
heap.push(Reverse(SortableBlock::new(child, blue_work)));
}
}
Expand All @@ -559,7 +559,7 @@ impl ConsensusApi for Consensus {

for child in children {
if visited.insert(child) {
let blue_work = self.ghostdag_primary_store.get_blue_work(child).unwrap();
let blue_work = self.ghostdag_store.get_blue_work(child).unwrap();
heap.push(Reverse(SortableBlock::new(child, blue_work)));
}
}
Expand Down

0 comments on commit 4c9f997

Please sign in to comment.