Skip to content
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

chore: also forbid entry.destination in same-sat mode #3038

Merged
merged 2 commits into from
Jan 25, 2024
Merged

chore: also forbid entry.destination in same-sat mode #3038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e141f7
merge master
zhiqiangxu Jan 25, 2024
be4d32b
Fix test
raphjaph Jan 25, 2024
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/wallet/inscribe/batch_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ impl Batchfile {
.inscriptions
.iter()
.any(|entry| entry.destination.is_some())
&& self.mode == Mode::SharedOutput
&& (self.mode == Mode::SharedOutput || self.mode == Mode::SameSat)
{
return Err(anyhow!(
"individual inscription destinations cannot be set in shared-output mode"
"individual inscription destinations cannot be set in shared-output or same-sat mode"
));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/wallet/inscribe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@ fn batch_inscribe_fails_with_shared_output_and_destination_set() {
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.expected_exit_code(1)
.stderr_regex("error: individual inscription destinations cannot be set in shared-output mode\n")
.stderr_regex("error: individual inscription destinations cannot be set in shared-output or same-sat mode\n")
.run_and_extract_stdout();
}

Expand Down
Loading