Skip to content

fix(docs): merge_chains outdated documentation#1806

Merged
evanlinjin merged 1 commit intobitcoindevkit:masterfrom
oleonardolima:fix/merge-chains-docs
May 16, 2025
Merged

fix(docs): merge_chains outdated documentation#1806
evanlinjin merged 1 commit intobitcoindevkit:masterfrom
oleonardolima:fix/merge-chains-docs

Conversation

@oleonardolima
Copy link
Copy Markdown
Collaborator

Description

It's a minor documentation fix, as reported during the audit and referenced in bitcoindevkit/bdk_wallet#59.

Notes to the reviewers

I'm unsure if anything else / any other explanation should be included in the documentation. Let me know if you think more context should be added to it.

Changelog notice

  • Update bdk_chain::local_chain::merge_chains documentation.

Checklists

All Submissions:

  • I've signed all my commits
  • I followed the contribution guidelines
  • I ran cargo fmt and cargo clippy before committing

@oleonardolima oleonardolima added the documentation Improvements or additions to documentation label Jan 21, 2025
@oleonardolima oleonardolima self-assigned this Jan 21, 2025
Comment thread crates/chain/src/local_chain.rs Outdated
Comment thread crates/chain/src/local_chain.rs Outdated
Comment thread crates/chain/src/local_chain.rs Outdated
@oleonardolima oleonardolima force-pushed the fix/merge-chains-docs branch 2 times, most recently from 50b036c to 166a8f9 Compare March 20, 2025 13:48
@oleonardolima
Copy link
Copy Markdown
Collaborator Author

@ValuedMammal Great, thanks for the suggestions! I've rebased the branch and applied the suggestions.

@ValuedMammal ValuedMammal moved this to Needs Review in BDK Chain Mar 27, 2025
Copy link
Copy Markdown
Collaborator

@ValuedMammal ValuedMammal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 166a8f9

@notmandatory notmandatory added this to the Wallet 2.0.0 milestone Apr 26, 2025
///
/// On success, a tuple is returned `(changeset, can_replace)`. If `can_replace` is true, then the
/// `update_tip` can replace the `original_tip`.
/// On success, a tuple is returned ([`CheckPoint`], [`ChangeSet`]).
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// On success, a tuple is returned ([`CheckPoint`], [`ChangeSet`]).
/// On success, a tuple is returned ([`CheckPoint`], [`ChangeSet`]). A [`CannotConnectError`] occurs when the `original_tip` and `update_tip` chains are disjoint.

I'd move the rest of the explanation for CannotConnectError to that type's doc.

But I don't want to bike-shed it too much so I'll also ACK this as is and you decide.

Copy link
Copy Markdown
Member

@notmandatory notmandatory left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 166a8f9

Comment thread crates/chain/src/local_chain.rs Outdated
Comment thread crates/chain/src/local_chain.rs Outdated
- it's a small fix for `merge_chains` docs, reported on audit.
- adds an `Errors` section to cover what scenarios it can fail.
@evanlinjin evanlinjin force-pushed the fix/merge-chains-docs branch from 166a8f9 to 5647241 Compare May 16, 2025 08:14
Copy link
Copy Markdown
Member

@evanlinjin evanlinjin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self-ACK 5647241

Just fixed up some documentation errors.

@evanlinjin evanlinjin merged commit 75ef7c0 into bitcoindevkit:master May 16, 2025
17 checks passed
@github-project-automation github-project-automation bot moved this from Needs Review to Done in BDK Chain May 16, 2025
@oleonardolima oleonardolima deleted the fix/merge-chains-docs branch May 19, 2025 18:18
@ValuedMammal ValuedMammal mentioned this pull request May 26, 2025
39 tasks
Copy link
Copy Markdown

@CosmicJesterX CosmicJesterX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants