Compare commits

..

2 Commits

Author SHA1 Message Date
Elichai Turkel
74c121da22 Fixed DAGToplogy test mock 2021-03-02 21:23:49 +02:00
Elichai Turkel
4481c343e0 Add comments and fix off-by-one in the mergeSetIncrease queue 2021-03-02 21:23:48 +02:00

View File

@@ -193,12 +193,11 @@ func (csm *consensusStateManager) selectVirtualSelectedParent(
}
}
// mergeSetIncrease returns different things depending on the result:
// If the candidate can be a virtual parent then canBeParent=true and mergeSetIncrease=The increase in merge set size
// If the candidate can't be a virtual parent, then canBeParent=false and newCandidate is a new proposed candidate in the past of candidate.
func (csm *consensusStateManager) mergeSetIncrease(candidate *externalapi.DomainHash, selectedVirtualParents []*externalapi.DomainHash, mergeSetSize uint64,
) (canBeParent bool, newCandidate *externalapi.DomainHash, mergeSetIncrease uint64, err error) {
) (canBeParent bool, newCandidate *externalapi.DomainHash, mergeSetIncrease uint64, err error) {
onEnd := logger.LogAndMeasureExecutionTime(log, "mergeSetIncrease")
defer onEnd()