Skip to content

Commit 5647241

Browse files
oleonardolimaevanlinjin
authored andcommitted
fix(docs): merge_chains documentation
- it's a small fix for `merge_chains` docs, reported on audit. - adds an `Errors` section to cover what scenarios it can fail.
1 parent b9e4e4c commit 5647241

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

crates/chain/src/local_chain.rs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,31 +545,46 @@ impl std::error::Error for ApplyHeaderError {}
545545

546546
/// Applies `update_tip` onto `original_tip`.
547547
///
548-
/// On success, a tuple is returned `(changeset, can_replace)`. If `can_replace` is true, then the
549-
/// `update_tip` can replace the `original_tip`.
548+
/// On success, a tuple is returned ([`CheckPoint`], [`ChangeSet`]).
549+
///
550+
/// # Errors
551+
///
552+
/// [`CannotConnectError`] occurs when the `original_tip` and `update_tip` chains are disjoint:
553+
///
554+
/// - If no point of agreement is found between the update and original chains.
555+
/// - A point of agreement is found but the update is ambiguous above the point of agreement (a.k.a.
556+
/// the update and original chain both have a block above the point of agreement, but their
557+
/// heights do not overlap).
558+
/// - The update attempts to replace the genesis block of the original chain.
550559
fn merge_chains(
551560
original_tip: CheckPoint,
552561
update_tip: CheckPoint,
553562
) -> Result<(CheckPoint, ChangeSet), CannotConnectError> {
554563
let mut changeset = ChangeSet::default();
564+
555565
let mut orig = original_tip.iter();
556566
let mut update = update_tip.iter();
567+
557568
let mut curr_orig = None;
558569
let mut curr_update = None;
570+
559571
let mut prev_orig: Option<CheckPoint> = None;
560572
let mut prev_update: Option<CheckPoint> = None;
573+
561574
let mut point_of_agreement_found = false;
575+
562576
let mut prev_orig_was_invalidated = false;
577+
563578
let mut potentially_invalidated_heights = vec![];
564579

565580
// If we can, we want to return the update tip as the new tip because this allows checkpoints
566581
// in multiple locations to keep the same `Arc` pointers when they are being updated from each
567-
// other using this function. We can do this as long as long as the update contains every
582+
// other using this function. We can do this as long as the update contains every
568583
// block's height of the original chain.
569584
let mut is_update_height_superset_of_original = true;
570585

571586
// To find the difference between the new chain and the original we iterate over both of them
572-
// from the tip backwards in tandem. We always dealing with the highest one from either chain
587+
// from the tip backwards in tandem. We are always dealing with the highest one from either chain
573588
// first and move to the next highest. The crucial logic is applied when they have blocks at the
574589
// same height.
575590
loop {

0 commit comments

Comments
 (0)