Repository navigation
fix: #128 swap ours and theirs in Wallet.File.merge error - #132
Merged
Merged
Conversation
The IOException thrown by Wallet.File.merge on an id mismatch labelled the other wallet's id as ours and this wallet's id as theirs, sending a reader to the wrong side of the comparison. Swap the FormattedText arguments so the label matches the value, and update the pinned assertion in WalletTest.doesNotMergeWalletsWithDifferentId. Closes zold-io#128
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The IOException thrown by Wallet.File.merge on an id mismatch labelled the other wallet's id as ours and this wallet's id as theirs, so a maintainer reading the message followed the labels to the wrong side of the comparison. The guard
other.id() != this.id()itself was correct; only the FormattedText arguments were ordered wrong.This change swaps the two arguments so the label matches the value, and updates the assertion in WalletTest.doesNotMergeWalletsWithDifferentId that pinned the previous buggy message. No other call site is touched.
Verified locally with
mvn --batch-mode -Pqulice clean installon Java 21: BUILD SUCCESS, qulice clean, 68 tests run with 0 failures, 0 errors, 1 skipped.Closes #128