@@ -101,7 +101,6 @@ pub struct BitcoinRegtestController {
101
101
burnchain_config : Option < Burnchain > ,
102
102
ongoing_block_commit : Option < OngoingBlockCommit > ,
103
103
should_keep_running : Option < Arc < AtomicBool > > ,
104
- allow_rbf : bool ,
105
104
}
106
105
107
106
#[ derive( Clone ) ]
@@ -357,7 +356,6 @@ impl BitcoinRegtestController {
357
356
burnchain_config : burnchain,
358
357
ongoing_block_commit : None ,
359
358
should_keep_running,
360
- allow_rbf : true ,
361
359
}
362
360
}
363
361
@@ -403,7 +401,6 @@ impl BitcoinRegtestController {
403
401
burnchain_config : None ,
404
402
ongoing_block_commit : None ,
405
403
should_keep_running : None ,
406
- allow_rbf : true ,
407
404
}
408
405
}
409
406
@@ -748,19 +745,14 @@ impl BitcoinRegtestController {
748
745
749
746
// Configure UTXO filter
750
747
let address = self . get_miner_address ( epoch_id, & pubk) ;
751
- test_debug ! (
752
- "Get UTXOs for {} ({}) rbf={}" ,
753
- pubk. to_hex( ) ,
754
- addr2str( & address) ,
755
- self . allow_rbf
756
- ) ;
748
+ test_debug ! ( "Get UTXOs for {} ({})" , pubk. to_hex( ) , addr2str( & address) , ) ;
757
749
let filter_addresses = vec ! [ addr2str( & address) ] ;
758
750
759
751
let mut utxos = loop {
760
752
let result = BitcoinRPCRequest :: list_unspent (
761
753
& self . config ,
762
754
filter_addresses. clone ( ) ,
763
- ! self . allow_rbf , // if RBF is disabled, then we can use 0-conf txs
755
+ false ,
764
756
total_required,
765
757
& utxos_to_exclude,
766
758
block_height,
@@ -794,7 +786,7 @@ impl BitcoinRegtestController {
794
786
let result = BitcoinRPCRequest :: list_unspent (
795
787
& self . config ,
796
788
filter_addresses. clone ( ) ,
797
- ! self . allow_rbf , // if RBF is disabled, then we can use 0-conf txs
789
+ false ,
798
790
total_required,
799
791
& utxos_to_exclude,
800
792
block_height,
@@ -1510,7 +1502,7 @@ impl BitcoinRegtestController {
1510
1502
signer : & mut BurnchainOpSigner ,
1511
1503
) -> Result < Transaction , BurnchainControllerError > {
1512
1504
// Are we currently tracking an operation?
1513
- if self . ongoing_block_commit . is_none ( ) || ! self . allow_rbf {
1505
+ if self . ongoing_block_commit . is_none ( ) {
1514
1506
// Good to go, let's build the transaction and send it.
1515
1507
let res =
1516
1508
self . send_block_commit_operation ( epoch_id, payload, signer, None , None , None , & [ ] ) ;
0 commit comments