Skip to content

Commit

Permalink
Rename Inscribe to Batch in integration tests (#3404)
Browse files Browse the repository at this point in the history
  • Loading branch information
@casey
casey committed Mar 29, 2024
1 parent 679f51d commit 2e7e1c3
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 65 deletions.
2 changes: 1 addition & 1 deletion tests/json_api.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fn get_sat_with_inscription_on_common_sat_and_more_inscriptions() {

let txid = bitcoin_rpc_server.mine_blocks(1)[0].txdata[0].txid();

let Inscribe { reveal, .. } = CommandBuilder::new(format!(
let Batch { reveal, .. } = CommandBuilder::new(format!(
"wallet inscribe --satpoint {}:0:1 --fee-rate 1 --file foo.txt",
txid
))
Expand Down
8 changes: 4 additions & 4 deletions tests/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ mod wallet;
const RUNE: u128 = 99246114928149462;

type Balance = ord::subcommand::wallet::balance::Output;
type Batch = ord::wallet::batch::Output;
type Create = ord::subcommand::wallet::create::Output;
type Inscribe = ord::wallet::batch::Output;
type Inscriptions = Vec<ord::subcommand::wallet::inscriptions::Output>;
type Send = ord::subcommand::wallet::send::Output;
type Supply = ord::subcommand::supply::Output;
Expand Down Expand Up @@ -115,7 +115,7 @@ fn inscribe(
.write("foo.txt", "FOO")
.bitcoin_rpc_server(bitcoin_rpc_server)
.ord_rpc_server(ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -157,7 +157,7 @@ fn drain(bitcoin_rpc_server: &test_bitcoincore_rpc::Handle, ord_rpc_server: &Tes

struct Etched {
id: RuneId,
inscribe: Inscribe,
inscribe: Batch,
}

fn etch(
Expand Down Expand Up @@ -215,7 +215,7 @@ fn batch(

bitcoin_rpc_server.mine_blocks(6);

let inscribe = spawn.run_and_deserialize_output::<Inscribe>();
let inscribe = spawn.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down
6 changes: 3 additions & 3 deletions tests/server.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ fn multiple_inscriptions_appear_on_reveal_transaction_page() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -257,7 +257,7 @@ fn inscription_metadata() {
.write("metadata.json", metadata)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>()
.run_and_deserialize_output::<Batch>()
.inscriptions
.first()
.unwrap()
Expand Down Expand Up @@ -292,7 +292,7 @@ fn recursive_inscription_endpoint() {
.write("foo.txt", "FOO")
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down
52 changes: 26 additions & 26 deletions tests/wallet/batch_command.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn batch_inscribe_can_create_one_inscription() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -97,7 +97,7 @@ fn batch_inscribe_with_multiple_inscriptions() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -134,7 +134,7 @@ fn batch_inscribe_with_multiple_inscriptions_with_parent() {
.write("parent.png", [1; 520])
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand All @@ -152,7 +152,7 @@ fn batch_inscribe_with_multiple_inscriptions_with_parent() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -189,7 +189,7 @@ fn batch_inscribe_respects_dry_run_flag() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -220,7 +220,7 @@ fn batch_in_same_output_but_different_satpoints() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

let outpoint = output.inscriptions[0].location.outpoint;
for (i, inscription) in output.inscriptions.iter().enumerate() {
Expand Down Expand Up @@ -287,7 +287,7 @@ fn batch_in_same_output_with_non_default_postage() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

let outpoint = output.inscriptions[0].location.outpoint;

Expand Down Expand Up @@ -349,7 +349,7 @@ fn batch_in_separate_outputs_with_parent() {
.write("parent.png", [1; 520])
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand All @@ -367,7 +367,7 @@ fn batch_in_separate_outputs_with_parent() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

for inscription in &output.inscriptions {
assert_eq!(inscription.location.offset, 0);
Expand Down Expand Up @@ -426,7 +426,7 @@ fn batch_in_separate_outputs_with_parent_and_non_default_postage() {
.write("parent.png", [1; 520])
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand All @@ -444,7 +444,7 @@ fn batch_in_separate_outputs_with_parent_and_non_default_postage() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

for inscription in &output.inscriptions {
assert_eq!(inscription.location.offset, 0);
Expand Down Expand Up @@ -571,7 +571,7 @@ inscriptions:
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -622,7 +622,7 @@ fn batch_same_sat() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

assert_eq!(
output.inscriptions[0].location,
Expand Down Expand Up @@ -681,7 +681,7 @@ fn batch_same_sat_with_parent() {
.write("parent.png", [1; 520])
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand All @@ -697,7 +697,7 @@ fn batch_same_sat_with_parent() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

assert_eq!(
output.inscriptions[0].location,
Expand Down Expand Up @@ -764,7 +764,7 @@ fn batch_same_sat_with_satpoint_and_reinscription() {
.write("parent.png", [1; 520])
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -795,7 +795,7 @@ fn batch_same_sat_with_satpoint_and_reinscription() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

assert_eq!(
output.inscriptions[0].location,
Expand Down Expand Up @@ -864,7 +864,7 @@ fn batch_inscribe_with_sat_argument_with_parent() {
.write("parent.png", [1; 520])
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand All @@ -882,7 +882,7 @@ fn batch_inscribe_with_sat_argument_with_parent() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -941,7 +941,7 @@ fn batch_inscribe_with_satpoint() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -977,7 +977,7 @@ fn batch_inscribe_with_fee_rate() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

let commit_tx = &bitcoin_rpc_server.mempool()[0];
let mut fee = 0;
Expand Down Expand Up @@ -1039,7 +1039,7 @@ inscriptions:
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -1098,7 +1098,7 @@ fn batch_inscribe_with_satpoints_with_parent() {
.write("parent.png", [1; 520])
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -1190,7 +1190,7 @@ inscriptions:
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -1371,7 +1371,7 @@ inscriptions:
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();

bitcoin_rpc_server.mine_blocks(1);

Expand Down Expand Up @@ -2478,5 +2478,5 @@ fn oversize_runestones_are_allowed_with_no_limit() {
)
.bitcoin_rpc_server(&bitcoin_rpc_server)
.ord_rpc_server(&ord_rpc_server)
.run_and_deserialize_output::<Inscribe>();
.run_and_deserialize_output::<Batch>();
}
Loading

0 comments on commit 2e7e1c3

Please sign in to comment.