Skip to content

Commit f0ae3d5

Browse files
luizParreiraluizParreira
committed
Write test cases for new send_to_address
1 parent c00ee91 commit f0ae3d5

File tree

3 files changed

+58
-26
lines changed

3 files changed

+58
-26
lines changed

Diff for: ‎integration_test/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ PID1=$!
1919
sleep 3
2020

2121
BLOCKFILTERARG=""
22-
if bitcoind -version | grep -q "v0\.\(19\|2\)"; then
22+
if bitcoind -version | grep -q "v\\(19\|20\|21\|22\)"; then
2323
BLOCKFILTERARG="-blockfilterindex=1"
2424
fi
2525

2626
FALLBACKFEEARG=""
27-
if bitcoind -version | grep -q "v0\.2"; then
27+
if bitcoind -version | grep -q "v\\(20\|21\|22\)"; then
2828
FALLBACKFEEARG="-fallbackfee=0.00001000"
2929
fi
3030

Diff for: ‎integration_test/src/main.rs

+55-23
Original file line numberDiff line numberDiff line change
@@ -362,17 +362,38 @@ fn test_set_label(cl: &Client) {
362362
fn test_send_to_address(cl: &Client) {
363363
let addr = cl.get_new_address(None, None).unwrap();
364364
let est = json::EstimateMode::Conservative;
365-
let _ = cl.send_to_address(&addr, btc(1), Some("cc"), None, None, None, None, None).unwrap();
366-
let _ = cl.send_to_address(&addr, btc(1), None, Some("tt"), None, None, None, None).unwrap();
367-
let _ = cl.send_to_address(&addr, btc(1), None, None, Some(true), None, None, None).unwrap();
368-
let _ = cl.send_to_address(&addr, btc(1), None, None, None, Some(true), None, None).unwrap();
369-
let _ = cl.send_to_address(&addr, btc(1), None, None, None, None, Some(3), None).unwrap();
370-
let _ = cl.send_to_address(&addr, btc(1), None, None, None, None, None, Some(est)).unwrap();
365+
let _ = cl
366+
.send_to_address(&addr, btc(1), Some("cc"), None, None, None, None, None, None, None)
367+
.unwrap();
368+
let _ = cl
369+
.send_to_address(&addr, btc(1), None, Some("tt"), None, None, None, None, None, None)
370+
.unwrap();
371+
let _ = cl
372+
.send_to_address(&addr, btc(1), None, None, Some(true), None, None, None, None, None)
373+
.unwrap();
374+
let _ = cl
375+
.send_to_address(&addr, btc(1), None, None, None, Some(true), None, None, None, None)
376+
.unwrap();
377+
let _ = cl
378+
.send_to_address(&addr, btc(1), None, None, None, None, Some(3), None, None, None)
379+
.unwrap();
380+
let _ = cl
381+
.send_to_address(&addr, btc(1), None, None, None, None, None, Some(est), None, None)
382+
.unwrap();
383+
let _ = cl
384+
.send_to_address(&addr, btc(1), None, None, None, None, None, None, Some(false), None)
385+
.unwrap();
386+
let _ = cl
387+
.send_to_address(&addr, btc(1), None, None, None, None, None, None, None, Some(5))
388+
.unwrap();
389+
let _ =
390+
cl.send_to_address(&addr, btc(1), None, None, None, None, None, None, None, None).unwrap();
371391
}
372392

373393
fn test_get_received_by_address(cl: &Client) {
374394
let addr = cl.get_new_address(None, None).unwrap();
375-
let _ = cl.send_to_address(&addr, btc(1), None, None, None, None, None, None).unwrap();
395+
let _ =
396+
cl.send_to_address(&addr, btc(1), None, None, None, None, None, None, None, None).unwrap();
376397
assert_eq!(cl.get_received_by_address(&addr, Some(0)).unwrap(), btc(1));
377398
assert_eq!(cl.get_received_by_address(&addr, Some(1)).unwrap(), btc(0));
378399
let _ = cl.generate_to_address(7, &cl.get_new_address(None, None).unwrap()).unwrap();
@@ -382,13 +403,15 @@ fn test_get_received_by_address(cl: &Client) {
382403

383404
fn test_list_unspent(cl: &Client) {
384405
let addr = cl.get_new_address(None, None).unwrap();
385-
let txid = cl.send_to_address(&addr, btc(1), None, None, None, None, None, None).unwrap();
406+
let txid =
407+
cl.send_to_address(&addr, btc(1), None, None, None, None, None, None, None, None).unwrap();
386408
let unspent = cl.list_unspent(Some(0), None, Some(&[&addr]), None, None).unwrap();
387409
assert_eq!(unspent[0].txid, txid);
388410
assert_eq!(unspent[0].address.as_ref(), Some(&addr));
389411
assert_eq!(unspent[0].amount, btc(1));
390412

391-
let txid = cl.send_to_address(&addr, btc(7), None, None, None, None, None, None).unwrap();
413+
let txid =
414+
cl.send_to_address(&addr, btc(7), None, None, None, None, None, None, None, None).unwrap();
392415
let options = json::ListUnspentQueryOptions {
393416
minimum_amount: Some(btc(7)),
394417
maximum_amount: Some(btc(7)),
@@ -411,7 +434,8 @@ fn test_get_connection_count(cl: &Client) {
411434

412435
fn test_get_raw_transaction(cl: &Client) {
413436
let addr = cl.get_new_address(None, None).unwrap();
414-
let txid = cl.send_to_address(&addr, btc(1), None, None, None, None, None, None).unwrap();
437+
let txid =
438+
cl.send_to_address(&addr, btc(1), None, None, None, None, None, None, None, None).unwrap();
415439
let tx = cl.get_raw_transaction(&txid, None).unwrap();
416440
let hex = cl.get_raw_transaction_hex(&txid, None).unwrap();
417441
assert_eq!(tx, deserialize(&Vec::<u8>::from_hex(&hex).unwrap()).unwrap());
@@ -429,8 +453,9 @@ fn test_get_raw_mempool(cl: &Client) {
429453
}
430454

431455
fn test_get_transaction(cl: &Client) {
432-
let txid =
433-
cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None).unwrap();
456+
let txid = cl
457+
.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None, None, None)
458+
.unwrap();
434459
let tx = cl.get_transaction(&txid, None).unwrap();
435460
assert_eq!(tx.amount, sbtc(-1.0));
436461
assert_eq!(tx.info.txid, txid);
@@ -454,8 +479,9 @@ fn test_list_since_block(cl: &Client) {
454479
}
455480

456481
fn test_get_tx_out(cl: &Client) {
457-
let txid =
458-
cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None).unwrap();
482+
let txid = cl
483+
.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None, None, None)
484+
.unwrap();
459485
let out = cl.get_tx_out(&txid, 0, Some(false)).unwrap();
460486
assert!(out.is_none());
461487
let out = cl.get_tx_out(&txid, 0, Some(true)).unwrap();
@@ -464,18 +490,21 @@ fn test_get_tx_out(cl: &Client) {
464490
}
465491

466492
fn test_get_tx_out_proof(cl: &Client) {
467-
let txid1 =
468-
cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None).unwrap();
469-
let txid2 =
470-
cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None).unwrap();
493+
let txid1 = cl
494+
.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None, None, None)
495+
.unwrap();
496+
let txid2 = cl
497+
.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None, None, None)
498+
.unwrap();
471499
let blocks = cl.generate_to_address(7, &cl.get_new_address(None, None).unwrap()).unwrap();
472500
let proof = cl.get_tx_out_proof(&[txid1, txid2], Some(&blocks[0])).unwrap();
473501
assert!(!proof.is_empty());
474502
}
475503

476504
fn test_get_mempool_entry(cl: &Client) {
477-
let txid =
478-
cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None).unwrap();
505+
let txid = cl
506+
.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None, None, None)
507+
.unwrap();
479508
let entry = cl.get_mempool_entry(&txid).unwrap();
480509
assert!(entry.spent_by.is_empty());
481510

@@ -485,7 +514,8 @@ fn test_get_mempool_entry(cl: &Client) {
485514

486515
fn test_lock_unspent_unlock_unspent(cl: &Client) {
487516
let addr = cl.get_new_address(None, None).unwrap();
488-
let txid = cl.send_to_address(&addr, btc(1), None, None, None, None, None, None).unwrap();
517+
let txid =
518+
cl.send_to_address(&addr, btc(1), None, None, None, None, None, None, None, None).unwrap();
489519

490520
assert!(cl.lock_unspent(&[OutPoint::new(txid, 0)]).unwrap());
491521
assert!(cl.unlock_unspent(&[OutPoint::new(txid, 0)]).unwrap());
@@ -801,7 +831,8 @@ fn test_finalize_psbt(cl: &Client) {
801831

802832
fn test_list_received_by_address(cl: &Client) {
803833
let addr = cl.get_new_address(None, None).unwrap();
804-
let txid = cl.send_to_address(&addr, btc(1), None, None, None, None, None, None).unwrap();
834+
let txid =
835+
cl.send_to_address(&addr, btc(1), None, None, None, None, None, None, None, None).unwrap();
805836

806837
let _ = cl.list_received_by_address(Some(&addr), None, None, None).unwrap();
807838
let _ = cl.list_received_by_address(Some(&addr), None, Some(true), None).unwrap();
@@ -1038,7 +1069,8 @@ fn test_getblocktemplate(cl: &Client) {
10381069
// contains an entry in the vector of GetBlockTemplateResultTransaction.
10391070
// Otherwise the GetBlockTemplateResultTransaction deserialization wouldn't
10401071
// be tested.
1041-
cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None).unwrap();
1072+
cl.send_to_address(&RANDOM_ADDRESS, btc(1), None, None, None, None, None, None, None, None)
1073+
.unwrap();
10421074

10431075
cl.get_block_template(GetBlockTemplateModes::Template, &[GetBlockTemplateRules::SegWit], &[])
10441076
.unwrap();

Diff for: ‎json/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ impl<'a> serde::Serialize for ImportMultiRequestScriptPubkey<'a> {
835835
#[derive(Serialize)]
836836
struct Tmp<'a> {
837837
pub address: &'a Address,
838-
};
838+
}
839839
serde::Serialize::serialize(
840840
&Tmp {
841841
address: addr,

0 commit comments

Comments
 (0)