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.

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

Mint runes with wallet #3298

Merged
merged 20 commits into from
Mar 17, 2024
Prev Previous commit
Next Next commit
Amend
  • Loading branch information
raphjaph committed Mar 17, 2024
commit 45a8631aca3ecb59a335a282209a8f61fc972d8e
6 changes: 3 additions & 3 deletions src/subcommand/wallet/mint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ impl Mint {
};

let Some(mint) = entry.mint else {
bail!("rune {rune} is not mintable");
bail!("rune {rune} not mintable");
};

if let Some(end) = mint.end {
ensure!(
end > bitcoin_client.get_block_count()?.try_into().unwrap(),
"rune {rune} mint has ended as of block {end}",
"rune {rune} mint ended on block {end}",
);
};

if let Some(deadline) = mint.deadline {
ensure!(
Duration::from_secs(deadline.into()) > SystemTime::now().duration_since(UNIX_EPOCH)?,
"rune {rune} mint has ended as of {deadline}",
"rune {rune} mint ended at {deadline}",
);
};

Expand Down
8 changes: 3 additions & 5 deletions tests/wallet/mint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ fn minting_rune_and_fails_if_after_end() {
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.expected_exit_code(1)
.expected_stderr("error: rune AAAAAAAAAAAAA mint has ended as of block 4\n")
.expected_stderr("error: rune AAAAAAAAAAAAA mint ended on block 4\n")
.run_and_extract_stdout();
}

Expand Down Expand Up @@ -139,7 +139,7 @@ fn minting_rune_fails_if_not_mintable() {
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.expected_exit_code(1)
.expected_stderr("error: rune AAAAAAAAAAAAA is not mintable\n")
.expected_stderr("error: rune AAAAAAAAAAAAA not mintable\n")
.run_and_extract_stdout();
}

Expand Down Expand Up @@ -200,8 +200,6 @@ fn minting_rune_fails_if_after_deadline() {
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.expected_exit_code(1)
.expected_stderr(format!(
"error: rune {rune} mint has ended as of {deadline}\n"
))
.expected_stderr(format!("error: rune {rune} mint ended at {deadline}\n"))
.run_and_extract_stdout();
}
Loading