Skip to content

fix: #128 swap ours and theirs in Wallet.File.merge error #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yegor256 merged 1 commit into from
Jun 14, 2026
Merged

fix: #128 swap ours and theirs in Wallet.File.merge error #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/zold/api/Wallet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ public Wallet merge(final Wallet other) throws IOException {
new UncheckedText(
new FormattedText(
"Wallet ID mismatch, ours is %d, theirs is %d",
other.id(),
this.id()
this.id(),
other.id()
)
).asString()
);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/zold/api/WalletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void doesNotMergeWalletsWithDifferentId() throws IOException {
() -> wallet.merge(new Wallet.Fake(123L))
).getMessage(),
Matchers.startsWith(
"Wallet ID mismatch, ours is 123, theirs is 5124095577148911"
"Wallet ID mismatch, ours is 5124095577148911, theirs is 123"
)
);
}
Expand Down
Loading