@@ -17,7 +17,7 @@ use std::collections::HashMap;
17
17
use std:: str:: FromStr ;
18
18
19
19
use bitcoin:: absolute:: LockTime ;
20
- use bitcoin:: address:: NetworkChecked ;
20
+ use bitcoin:: address:: { NetworkChecked , NetworkUnchecked } ;
21
21
use bitcoincore_rpc:: json;
22
22
use bitcoincore_rpc:: jsonrpc:: error:: Error as JsonRpcError ;
23
23
use bitcoincore_rpc:: { Auth , Client , Error , RpcApi } ;
@@ -28,8 +28,8 @@ use bitcoin::hashes::hex::FromHex;
28
28
use bitcoin:: hashes:: Hash ;
29
29
use bitcoin:: { secp256k1, sighash, ScriptBuf } ;
30
30
use bitcoin:: {
31
- Address , Amount , Network , OutPoint , PrivateKey , Sequence , SignedAmount , Transaction , TxIn ,
32
- TxOut , Txid , Witness ,
31
+ transaction , Address , Amount , Network , OutPoint , PrivateKey , Sequence , SignedAmount ,
32
+ Transaction , TxIn , TxOut , Txid , Witness ,
33
33
} ;
34
34
use bitcoincore_rpc:: bitcoincore_rpc_json:: {
35
35
GetBlockTemplateModes , GetBlockTemplateRules , ScanTxOutRequest ,
@@ -603,7 +603,7 @@ fn test_sign_raw_transaction_with_send_raw_transaction(cl: &Client) {
603
603
let unspent = unspent. into_iter ( ) . nth ( 0 ) . unwrap ( ) ;
604
604
605
605
let tx = Transaction {
606
- version : 1 ,
606
+ version : transaction :: Version :: ONE ,
607
607
lock_time : LockTime :: ZERO ,
608
608
input : vec ! [ TxIn {
609
609
previous_output: OutPoint {
@@ -615,7 +615,7 @@ fn test_sign_raw_transaction_with_send_raw_transaction(cl: &Client) {
615
615
witness: Witness :: new( ) ,
616
616
} ] ,
617
617
output : vec ! [ TxOut {
618
- value: ( unspent. amount - * FEE ) . to_sat ( ) ,
618
+ value: ( unspent. amount - * FEE ) ,
619
619
script_pubkey: addr. script_pubkey( ) ,
620
620
} ] ,
621
621
} ;
@@ -632,7 +632,7 @@ fn test_sign_raw_transaction_with_send_raw_transaction(cl: &Client) {
632
632
let txid = cl. send_raw_transaction ( & res. transaction ( ) . unwrap ( ) ) . unwrap ( ) ;
633
633
634
634
let tx = Transaction {
635
- version : 1 ,
635
+ version : transaction :: Version :: ONE ,
636
636
lock_time : LockTime :: ZERO ,
637
637
input : vec ! [ TxIn {
638
638
previous_output: OutPoint {
@@ -644,7 +644,7 @@ fn test_sign_raw_transaction_with_send_raw_transaction(cl: &Client) {
644
644
witness: Witness :: new( ) ,
645
645
} ] ,
646
646
output : vec ! [ TxOut {
647
- value: ( unspent. amount - * FEE - * FEE ) . to_sat ( ) ,
647
+ value: ( unspent. amount - * FEE - * FEE ) ,
648
648
script_pubkey: RANDOM_ADDRESS . script_pubkey( ) ,
649
649
} ] ,
650
650
} ;
@@ -1415,12 +1415,13 @@ fn test_add_multisig_address(cl: &Client) {
1415
1415
. is_ok( ) ) ;
1416
1416
}
1417
1417
1418
+ #[ rustfmt:: skip]
1418
1419
fn test_derive_addresses ( cl : & Client ) {
1419
1420
let descriptor =
1420
1421
r"pkh(02e96fe52ef0e22d2f131dd425ce1893073a3c6ad20e8cac36726393dfb4856a4c)#62k9sn4x" ;
1421
1422
assert_eq ! (
1422
1423
cl. derive_addresses( descriptor, None ) . unwrap( ) ,
1423
- vec![ "mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr" . parse( ) . unwrap( ) ]
1424
+ vec![ "mrkwtj5xpYQjHeJe5wsweNjVeTKkvR5fCr" . parse:: < Address < NetworkUnchecked >> ( ) . unwrap( ) ]
1424
1425
) ;
1425
1426
assert ! ( cl. derive_addresses( descriptor, Some ( [ 0 , 1 ] ) ) . is_err( ) ) ; // Range should not be specified for an unranged descriptor
1426
1427
@@ -1431,8 +1432,8 @@ fn test_derive_addresses(cl: &Client) {
1431
1432
assert_eq ! (
1432
1433
cl. derive_addresses( descriptor, Some ( [ 0 , 1 ] ) ) . unwrap( ) ,
1433
1434
vec![
1434
- "bcrt1q5n5tjkpva8v5s0uadu2y5f0g7pn4h5eqaq2ux2" . parse( ) . unwrap( ) ,
1435
- "bcrt1qcgl303ht03ja2e0hudpwk7ypcxk5t478wspzlt" . parse( ) . unwrap( ) ,
1435
+ "bcrt1q5n5tjkpva8v5s0uadu2y5f0g7pn4h5eqaq2ux2" . parse:: < Address < NetworkUnchecked >> ( ) . unwrap( ) ,
1436
+ "bcrt1qcgl303ht03ja2e0hudpwk7ypcxk5t478wspzlt" . parse:: < Address < NetworkUnchecked >> ( ) . unwrap( ) ,
1436
1437
]
1437
1438
) ;
1438
1439
assert ! ( cl. derive_addresses( descriptor, None ) . is_err( ) ) ; // Range must be specified for a ranged descriptor
0 commit comments